From a1da594888a9004253ae4669cbd2a10336b188de Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 11 Oct 2015 10:17:00 -0500 Subject: [PATCH] propagate libkscreen dependencies --- pkgs/desktops/plasma-5.4/kscreen.nix | 3 +-- pkgs/desktops/plasma-5.4/plasma-workspace/default.nix | 7 ++++--- pkgs/desktops/plasma-5.4/powerdevil.nix | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/kscreen.nix b/pkgs/desktops/plasma-5.4/kscreen.nix index 7123ead146a7..f2f348073650 100644 --- a/pkgs/desktops/plasma-5.4/kscreen.nix +++ b/pkgs/desktops/plasma-5.4/kscreen.nix @@ -10,9 +10,8 @@ plasmaPackage { ]; buildInputs = [ kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui - libkscreen ]; - propagatedBuildInputs = [ kglobalaccel ki18n qtdeclarative ]; + propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kscreen-console" ''; diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index b240302ace94..5e29fe2e2e62 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -19,12 +19,13 @@ plasmaPackage { buildInputs = [ kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff knotifyconfig kpackage ktextwidgets kwallet kwayland kxmlrpcclient - libdbusmenu libkscreen libSM libXcursor networkmanager-qt pam - phonon qtquick1 qtscript qtx11extras solid wayland + libdbusmenu libSM libXcursor networkmanager-qt pam phonon qtquick1 + qtscript qtx11extras solid wayland ]; propagatedBuildInputs = [ baloo kactivities kdeclarative kdelibs4support kglobalaccel - kidletime krunner ktexteditor kwin libksysguard plasma-framework + kidletime krunner ktexteditor kwin libkscreen libksysguard + plasma-framework ]; patches = [ ./0001-startkde-NixOS-patches.patch ]; diff --git a/pkgs/desktops/plasma-5.4/powerdevil.nix b/pkgs/desktops/plasma-5.4/powerdevil.nix index 08f7b4b70614..61398592d1fd 100644 --- a/pkgs/desktops/plasma-5.4/powerdevil.nix +++ b/pkgs/desktops/plasma-5.4/powerdevil.nix @@ -11,11 +11,10 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kconfig kdbusaddons knotifyconfig libkscreen plasma-workspace - solid udev + kconfig kdbusaddons knotifyconfig plasma-workspace solid udev ]; propagatedBuildInputs = [ kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime - qtx11extras + libkscreen qtx11extras ]; }