From 2f51355f4948ed79c6af2e90864c41f7bdbbc32c Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Tue, 5 Jul 2022 10:13:45 -0500 Subject: [PATCH] adjustments to shell.nix --- default.nix | 2 ++ shell.nix | 18 +++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/default.nix b/default.nix index fb6ba7d..fea7f8a 100644 --- a/default.nix +++ b/default.nix @@ -27,6 +27,7 @@ kirigami2, ki18n, kcoreaddons, + # lightly-qt, mpv }: @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { kirigami2 ki18n kcoreaddons + # lightly-qt mpv # libsForQt5.kconfig # ffmpeg-full diff --git a/shell.nix b/shell.nix index df17a55..bafbefb 100644 --- a/shell.nix +++ b/shell.nix @@ -38,13 +38,13 @@ mkShell { ]; # This creates the proper qt env so that plugins are found right. - shellHook = '' - # setQtEnvironment=$(mktemp --suffix .setQtEnvironment.sh) - # echo "shellHook: setQtEnvironment = $setQtEnvironment" - # makeWrapper "/bin/sh" "$setQtEnvironment" "''${qtWrapperArgs[@]}" - # sed "/^exec/d" -i "$setQtEnvironment" - # source "$setQtEnvironment" - # export QT_QPA_PLATFORM_PLUGIN_PATH=${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins/platformthemes - # export QML2_IMPORT_PATH=${libsForQt5.kirigami2}/lib/${builtins.replaceStrings ["full-"] [""] qt5.full.name}/qml - ''; + # shellHook = '' + # # setQtEnvironment=$(mktemp --suffix .setQtEnvironment.sh) + # # echo "shellHook: setQtEnvironment = $setQtEnvironment" + # # makeWrapper "/bin/sh" "$setQtEnvironment" "''${qtWrapperArgs[@]}" + # # sed "/^exec/d" -i "$setQtEnvironment" + # # source "$setQtEnvironment" + # # export QT_QPA_PLATFORM_PLUGIN_PATH=${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins/platformthemes + # # export QML2_IMPORT_PATH=${libsForQt5.kirigami2}/lib/${builtins.replaceStrings ["full-"] [""] qt5.full.name}/qml + # ''; }