diff options
| author | Thomas Tuegel <ttuegel@secure.mailbox.org> | 2017-06-24 15:19:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-24 15:19:36 -0500 |
| commit | 1593bd24235f2e9611f90fb914440b0d0ae5aeea (patch) | |
| tree | e724586e506818440f28396525c1dc8d1e1e0e5c /pkgs/desktops/plasma-5 | |
| parent | c0303c7110466e976cf89c824136264c11e90fd0 (diff) | |
| parent | 69438a397ffce9ad999cb05c451c14e55b9ebc90 (diff) | |
| download | nixlib-1593bd24235f2e9611f90fb914440b0d0ae5aeea.tar nixlib-1593bd24235f2e9611f90fb914440b0d0ae5aeea.tar.gz nixlib-1593bd24235f2e9611f90fb914440b0d0ae5aeea.tar.bz2 nixlib-1593bd24235f2e9611f90fb914440b0d0ae5aeea.tar.lz nixlib-1593bd24235f2e9611f90fb914440b0d0ae5aeea.tar.xz nixlib-1593bd24235f2e9611f90fb914440b0d0ae5aeea.tar.zst nixlib-1593bd24235f2e9611f90fb914440b0d0ae5aeea.zip | |
Merge pull request #26817 from ttuegel/qt-5.9
Qt 5.9
Diffstat (limited to 'pkgs/desktops/plasma-5')
| -rw-r--r-- | pkgs/desktops/plasma-5/khotkeys.nix | 1 | ||||
| -rw-r--r-- | pkgs/desktops/plasma-5/plasma-workspace/default.nix | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index abfb85a867c5..c54d5486ee96 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -13,4 +13,5 @@ mkDerivation { plasma-framework plasma-workspace qtx11extras ]; outputs = [ "out" "dev" "bin" ]; + enableParallelBuild = false; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index b866ebab0e51..b28a1e87fb6a 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -20,8 +20,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ isocodes libdbusmenu libSM libXcursor libXtst pam wayland - ]; - propagatedBuildInputs = [ + baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets |