From d013d746b62019654b9514d28c10b18ce713641a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 10:01:52 -0500 Subject: [PATCH] propagate kauth dependencies --- pkgs/desktops/plasma-5.4/libksysguard.nix | 4 +- .../plasma-5.4/plasma-desktop/default.nix | 4 +- pkgs/desktops/plasma-5.4/powerdevil.nix | 4 +- .../libraries/kde-frameworks-5.14/baloo.nix | 33 +++------------ .../kconfigwidgets/default.nix | 11 +---- .../kde-frameworks-5.14/kdelibs4support.nix | 40 ++++--------------- 6 files changed, 20 insertions(+), 76 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/libksysguard.nix b/pkgs/desktops/plasma-5.4/libksysguard.nix index 73cb38d89da5..afcb8a35b7ce 100644 --- a/pkgs/desktops/plasma-5.4/libksysguard.nix +++ b/pkgs/desktops/plasma-5.4/libksysguard.nix @@ -10,11 +10,11 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kauth kcompletion kconfigwidgets kcoreaddons kservice + kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons kwindowsystem plasma-framework qtscript qtwebkit qtx11extras ]; propagatedBuildInputs = [ - kconfig ki18n kiconthemes + kauth kconfig ki18n kiconthemes ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 99932ba63c3f..be0920457819 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -16,7 +16,7 @@ plasmaPackage { kdoctools ]; buildInputs = [ - attica boost fontconfig kauth kcmutils + attica boost fontconfig kcmutils kdbusaddons kdeclarative kded kdelibs4support kemoticons kglobalaccel ki18n kitemmodels knewstuff knotifications knotifyconfig kpeople krunner kwallet kwin libcanberra_kde @@ -24,7 +24,7 @@ plasmaPackage { plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev xf86inputsynaptics xkeyboard_config xinput ]; - propagatedBuildInputs = [ baloo kactivities ]; + propagatedBuildInputs = [ baloo kactivities kauth ]; patches = [ (substituteAll { src = ./0001-hwclock.patch; diff --git a/pkgs/desktops/plasma-5.4/powerdevil.nix b/pkgs/desktops/plasma-5.4/powerdevil.nix index 48ca659c6f7b..2d3a5521e7da 100644 --- a/pkgs/desktops/plasma-5.4/powerdevil.nix +++ b/pkgs/desktops/plasma-5.4/powerdevil.nix @@ -11,9 +11,9 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kauth kconfig kdbusaddons kdelibs4support kglobalaccel ki18n + kconfig kdbusaddons kdelibs4support kglobalaccel ki18n kidletime kio knotifyconfig libkscreen plasma-workspace qtx11extras solid udev ]; - propagatedBuildInputs = [ kactivities ]; + propagatedBuildInputs = [ kactivities kauth ]; } diff --git a/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix index 8b6b3509f0db..59133e404323 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix @@ -1,39 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kauth -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kfilemetadata -, ki18n -, kidletime -, kio -, lmdb -, qtbase -, qtquick1 -, solid +{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig +, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime +, kio, lmdb, qtbase, qtquick1, solid }: kdeFramework { name = "baloo"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kauth - kconfig - kcrash - kdbusaddons - ki18n - kidletime - kio - lmdb - qtquick1 - solid + kconfig kcrash kdbusaddons ki18n kidletime kio lmdb qtquick1 solid ]; propagatedBuildInputs = [ - kcoreaddons - kfilemetadata - qtbase + kauth kcoreaddons kfilemetadata qtbase ]; postInstall = '' wrapKDEProgram "$out/bin/baloo_file" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix index d16f7f92bea3..aa6fe8770814 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix @@ -1,12 +1,5 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kauth -, kcodecs -, kconfig -, kdoctools -, kguiaddons -, ki18n -, kwidgetsaddons +{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig +, kdoctools, kguiaddons, ki18n, kwidgetsaddons }: kdeFramework { diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix index f54fa3e9be65..cec5f268c21c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix @@ -1,36 +1,10 @@ -{ kdeFramework, lib -, extra-cmake-modules -, docbook_xml_dtd_45 -, kauth -, karchive -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kcrash -, kdbusaddons -, kdesignerplugin -, kdoctools -, kemoticons -, kglobalaccel -, kguiaddons -, ki18n -, kiconthemes -, kio -, kitemmodels -, kinit -, knotifications -, kparts -, kservice -, ktextwidgets -, kunitconversion -, kwidgetsaddons -, kwindowsystem -, kxmlgui -, networkmanager -, qtsvg -, qtx11extras -, xlibs +{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth +, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons +, kcrash, kdbusaddons, kdesignerplugin, kdoctools, kemoticons +, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels +, kinit, knotifications, kparts, kservice, ktextwidgets +, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui +, networkmanager, qtsvg, qtx11extras, xlibs }: # TODO: debug docbook detection