From 7500e0d19cfc71a8af1c0ac7914bfa88005a56fc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 16 Oct 2015 19:01:31 -0500 Subject: [PATCH] plasma-desktop: propagate runtime dependencies --- .../desktops/plasma-5.4/plasma-desktop/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index f0271e876874..77dfe3d91820 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -19,14 +19,14 @@ plasmaPackage { buildInputs = [ attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff knotifications knotifyconfig kwallet libcanberra_kde - libXcursor libpulseaudio libXft libxkbfile phonon qtdeclarative - qtx11extras qtsvg xf86inputevdev xf86inputsynaptics + libXcursor libpulseaudio libXft libxkbfile phonon + qtsvg xf86inputevdev xf86inputsynaptics xkeyboard_config xinput ]; propagatedBuildInputs = [ baloo kactivities kauth kdeclarative kdelibs4support kemoticons kglobalaccel ki18n kpeople krunner kwin plasma-framework - plasma-workspace + plasma-workspace qtdeclarative qtx11extras ]; patches = [ (substituteAll { @@ -41,6 +41,14 @@ plasmaPackage { "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg" ]; postInstall = '' + # These files are installed in the wrong location. + cd "$out/share/plasma/plasmoids/org.kde.desktopcontainment/contents" + mv "code/LayoutManager.js" "ui/LayoutManager.js" + cd "$out/share/plasma/plasmoids/org.kde.panel/contents" + mv "code/LayoutManager.js" "ui/LayoutManager.js" + + cd "$NIX_BUILD_TOP" + wrapKDEProgram "$out/bin/kaccess" wrapKDEProgram "$out/bin/solid-action-desktop-gen" wrapKDEProgram "$out/bin/knetattach"