diff options
author | John Ericson <git@JohnEricson.me> | 2019-11-24 15:10:34 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-24 15:10:34 -0500 |
commit | 10a0a23c4f0e1abca0b2f934a3e308df9510d3b2 (patch) | |
tree | 2e3ceee2e1216e212421a65098bbc2d0595eab4f /pkgs/applications/kde | |
parent | 24f73573e52c1ca40c71a7b67e5e96241c4b6146 (diff) | |
parent | 88dc84c18348ce992a7646a5e5e25c1b03cc5b51 (diff) | |
download | nixlib-10a0a23c4f0e1abca0b2f934a3e308df9510d3b2.tar nixlib-10a0a23c4f0e1abca0b2f934a3e308df9510d3b2.tar.gz nixlib-10a0a23c4f0e1abca0b2f934a3e308df9510d3b2.tar.bz2 nixlib-10a0a23c4f0e1abca0b2f934a3e308df9510d3b2.tar.lz nixlib-10a0a23c4f0e1abca0b2f934a3e308df9510d3b2.tar.xz nixlib-10a0a23c4f0e1abca0b2f934a3e308df9510d3b2.tar.zst nixlib-10a0a23c4f0e1abca0b2f934a3e308df9510d3b2.zip |
Merge pull request #73756 from FRidh/kde5
WIP KDE5: fix breakage due to set -u changes
Diffstat (limited to 'pkgs/applications/kde')
-rw-r--r-- | pkgs/applications/kde/konsole.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/kde/yakuake.nix | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 1be5b0b4a894..c20b003a8476 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -4,7 +4,7 @@ kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications, knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons, - kwindowsystem, kxmlgui, qtscript, knewstuff + kwindowsystem, kxmlgui, qtscript, knewstuff, kglobalaccel }: mkDerivation { @@ -18,6 +18,7 @@ mkDerivation { kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff + kglobalaccel ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; diff --git a/pkgs/applications/kde/yakuake.nix b/pkgs/applications/kde/yakuake.nix index 6f9c8df30012..17f7c08124c1 100644 --- a/pkgs/applications/kde/yakuake.nix +++ b/pkgs/applications/kde/yakuake.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdoctools, extra-cmake-modules, karchive, kcrash, kdbusaddons, ki18n, kiconthemes, knewstuff, knotifications, - knotifyconfig, konsole, kparts, kwindowsystem, qtx11extras + knotifyconfig, konsole, kparts, kwindowsystem, qtx11extras, kglobalaccel }: mkDerivation { @@ -9,7 +9,7 @@ mkDerivation { buildInputs = [ karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications - knotifyconfig kparts kwindowsystem qtx11extras + knotifyconfig kparts kwindowsystem qtx11extras kglobalaccel ]; propagatedBuildInputs = [ |