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

fixing shell.nix

Browse source
This commit is contained in:
Chris Cochrun 2022-08-24 10:04:02 -05:00
parent ad011ab2db
commit d177972e59
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
shell.nix
View file

@ -1,6 +1,6 @@
{ pkgs ? import <nixpkgs> { } }: { pkgs ? import <nixpkgs> { } }:
with pkgs; with pkgs;
mkShell { mkShell rec {
name = "presenter-env"; name = "presenter-env";
nativeBuildInputs = [ nativeBuildInputs = [
@ -11,6 +11,7 @@ mkShell {
extra-cmake-modules extra-cmake-modules
pkg-config pkg-config
libsForQt5.wrapQtAppsHook libsForQt5.wrapQtAppsHook
makeWrapper
# gccStdenv # gccStdenv
# stdenv # stdenv
]; ];
@ -32,7 +33,7 @@ mkShell {
libsForQt5.kcoreaddons libsForQt5.kcoreaddons
# This is only here because apparently it doesn't pick up the icon theme from the base system # This is only here because apparently it doesn't pick up the icon theme from the base system
papirus-icon-theme # papirus-icon-theme
# lightly-qt # lightly-qt
mpv mpv
@ -43,6 +44,11 @@ mkShell {
# 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 = ''
setQtEnvironment=$(mktemp --suffix .setQtEnvironment.sh)
echo "shellHook: setQtEnvironment = $setQtEnvironment"
makeWrapper "/bin/sh" "$setQtEnvironment" "''${qtWrapperArgs[@]}"
sed "/^exec/d" -i "$setQtEnvironment"
source "$setQtEnvironment"
fish fish
''; '';
} }