chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updating bits of nix stuff

Browse source
This commit is contained in:
Chris Cochrun 2023-09-20 06:16:39 -05:00
parent dafe74de25
commit 85f43fcc76
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
default.nix
View file

@ -35,8 +35,8 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libre-presenter"; name = "lumina";
pname = "libre-presenter"; pname = "lumina";
version = "0.0.1"; version = "0.0.1";
__noChroot = true; __noChroot = true;
@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with lib; { meta = with lib; {
name = "Libre Presenter"; name = "Lumina";
description = "A church presentation software made with QT/QML"; description = "A church presentation software made with QT/QML";
homepage = ""; homepage = "";
license = licenses.gpl3; license = licenses.gpl3;

5
shell.nix
View file

@ -56,7 +56,7 @@ mkShell rec {
rust-analyzer rust-analyzer
corrosion corrosion
]; ];
# cargoDeps = rustPlatform.importCargoLock { # cargoDeps = rustPlatform.importCargoLock {
# lockFile = ./Cargo.lock; # lockFile = ./Cargo.lock;
# }; # };
@ -66,6 +66,8 @@ mkShell rec {
CMAKE_C_COMPILER = "${gcc}/bin/gcc"; CMAKE_C_COMPILER = "${gcc}/bin/gcc";
CMAKE_CXX_COMPILER = "${gcc}/bin/g++"; CMAKE_CXX_COMPILER = "${gcc}/bin/g++";
# QT_SCALE_FACTOR = 1; # QT_SCALE_FACTOR = 1;
# QT_PLUGIN_PATH="${QT_PLUGIN_PATH/':''/nix/store/85jx8w2nh1ln4kb0hf3dc6ky0dh6ri24-lightly-qt-0.4.1/lib/qt-5.15.9/plugins'':'/':'}"
# QML2_IMPORT_PATH=${QML2_IMPORT_PATH/':''/run/current-system/sw/lib/qt-5.15.10/qml'':'/':'}
# This creates the proper qt env so that plugins are found right. # This creates the proper qt env so that plugins are found right.
shellHook = '' shellHook = ''
@ -74,5 +76,6 @@ mkShell rec {
makeQtWrapper "/bin/sh" "$setQtEnvironment" "''${qtWrapperArgs[@]}" makeQtWrapper "/bin/sh" "$setQtEnvironment" "''${qtWrapperArgs[@]}"
sed "/^exec/d" -i "$setQtEnvironment" sed "/^exec/d" -i "$setQtEnvironment"
source "$setQtEnvironment" source "$setQtEnvironment"
export QT_PLUGIN_PATH="$QT_PLUGIN_PATH:/nix/store/85jx8w2nh1ln4kb0hf3dc6ky0dh6ri24-lightly-qt-0.4.1/lib/qt-5.15.9/plugins"
''; '';
} }