diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 62931d9b1da..bde5aad07a0 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -73,7 +73,6 @@ in pkgs.qt4 # qtconfig is the only way to set Qt 4 theme kf5.kinit - kf5.kglobalaccel plasma5.breeze plasma5.kde-cli-tools diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 77dfe3d9182..eb013292805 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -9,7 +9,7 @@ , libcanberra_kde, libpulseaudio, makeKDEWrapper, utillinux }: -plasmaPackage { +plasmaPackage rec { name = "plasma-desktop"; nativeBuildInputs = [ extra-cmake-modules @@ -28,6 +28,9 @@ plasmaPackage { kglobalaccel ki18n kpeople krunner kwin plasma-framework plasma-workspace qtdeclarative qtx11extras ]; + # All propagatedBuildInputs should be present in the profile because + # wrappers cannot be used here. + propagatedUserEnvPkgs = propagatedBuildInputs; patches = [ (substituteAll { src = ./0001-hwclock.patch; diff --git a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix index 40912087b8c..afd8a18bbbd 100644 --- a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix +++ b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix @@ -4,7 +4,7 @@ , taglib }: -plasmaPackage { +plasmaPackage rec { name = "plasma-mediacenter"; nativeBuildInputs = [ extra-cmake-modules @@ -17,4 +17,7 @@ plasmaPackage { baloo kactivities kdeclarative kfilemetadata ki18n kio plasma-framework ]; + # All propagatedBuildInputs should be present in the profile because + # wrappers cannot be used here. + propagatedUserEnvPkgs = propagatedBuildInputs; } diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index a2843a19290..37f55204ec1 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -10,7 +10,7 @@ , xprop, xrdb, xset, xsetroot, solid, qtquickcontrols }: -plasmaPackage { +plasmaPackage rec { name = "plasma-workspace"; nativeBuildInputs = [ extra-cmake-modules @@ -28,6 +28,9 @@ plasmaPackage { kidletime krunner ktexteditor kwin libkscreen libksysguard plasma-framework qtquick1 qtquickcontrols qtx11extras solid ]; + # All propagatedBuildInputs should be present in the profile because + # impure wrappers are used below. + propagatedUserEnvPkgs = propagatedBuildInputs; patches = [ ./0001-startkde-NixOS-patches.patch ]; inherit bash coreutils gnused gnugrep socat;