From cf1c90837751f8e4b727a97a8e689131fd858d61 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 09:58:23 -0500 Subject: [PATCH] propagate kactivities dependencies --- pkgs/applications/kde-apps-15.08/dolphin.nix | 2 +- pkgs/applications/kde-apps-15.08/gwenview.nix | 2 +- pkgs/applications/kde-apps-15.08/kate.nix | 4 +- pkgs/desktops/plasma-5.4/kwin/default.nix | 81 +++---------------- .../plasma-5.4/plasma-desktop/default.nix | 4 +- .../plasma-5.4/plasma-mediacenter.nix | 4 +- .../plasma-5.4/plasma-workspace/default.nix | 4 +- pkgs/desktops/plasma-5.4/powerdevil.nix | 41 ++-------- .../plasma-framework/default.nix | 31 ++----- 9 files changed, 39 insertions(+), 134 deletions(-) diff --git a/pkgs/applications/kde-apps-15.08/dolphin.nix b/pkgs/applications/kde-apps-15.08/dolphin.nix index 2b886b63d146..e61d322d435b 100644 --- a/pkgs/applications/kde-apps-15.08/dolphin.nix +++ b/pkgs/applications/kde-apps-15.08/dolphin.nix @@ -49,7 +49,6 @@ kdeApp { ktexteditor kwindowsystem knotifications - kactivities phonon baloo-widgets kfilemetadata @@ -57,6 +56,7 @@ kdeApp { ]; propagatedBuildInputs = [ baloo + kactivities ]; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; diff --git a/pkgs/applications/kde-apps-15.08/gwenview.nix b/pkgs/applications/kde-apps-15.08/gwenview.nix index 4a83209dc0cf..97cb2dd0502b 100644 --- a/pkgs/applications/kde-apps-15.08/gwenview.nix +++ b/pkgs/applications/kde-apps-15.08/gwenview.nix @@ -21,7 +21,6 @@ kdeApp { ]; buildInputs = [ exiv2 - kactivities kdelibs4support kio lcms2 @@ -30,6 +29,7 @@ kdeApp { ]; propagatedBuildInputs = [ baloo + kactivities qtx11extras ]; meta = { diff --git a/pkgs/applications/kde-apps-15.08/kate.nix b/pkgs/applications/kde-apps-15.08/kate.nix index b24ef0b863f6..39db56edb059 100644 --- a/pkgs/applications/kde-apps-15.08/kate.nix +++ b/pkgs/applications/kde-apps-15.08/kate.nix @@ -34,7 +34,6 @@ kdeApp { ]; buildInputs = [ qtscript - kactivities kconfig kcrash kguiaddons @@ -56,6 +55,9 @@ kdeApp { knewstuff libgit2 ]; + propagatedBuildInputs = [ + kactivities + ]; meta = { license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix index 429d336f661a..958bc45180a3 100644 --- a/pkgs/desktops/plasma-5.4/kwin/default.nix +++ b/pkgs/desktops/plasma-5.4/kwin/default.nix @@ -1,39 +1,10 @@ -{ plasmaPackage -, extra-cmake-modules -, kdoctools -, epoxy -, kactivities -, kcompletion -, kcmutils -, kconfig -, kconfigwidgets -, kcoreaddons -, kcrash -, kdeclarative -, kdecoration -, kglobalaccel -, ki18n -, kiconthemes -, kinit -, kio -, knewstuff -, knotifications -, kpackage -, kservice -, kwayland -, kwidgetsaddons -, kwindowsystem -, kxmlgui -, libinput -, libICE -, libSM -, plasma-framework -, qtdeclarative -, qtscript -, qtx11extras -, udev -, wayland -, xcb-util-cursor +{ plasmaPackage, extra-cmake-modules, kdoctools, epoxy +, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets +, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel +, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications +, kpackage, kservice, kwayland, kwidgetsaddons, kwindowsystem +, kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative +, qtscript, qtx11extras, udev, wayland, xcb-util-cursor }: plasmaPackage { @@ -43,40 +14,14 @@ plasmaPackage { kdoctools ]; buildInputs = [ - epoxy - kactivities - kcompletion - kcmutils - kconfig - kconfigwidgets - kcoreaddons - kcrash - kdeclarative - kdecoration - kglobalaccel - ki18n - kiconthemes - kinit - kio - knewstuff - knotifications - kpackage - kservice - kwayland - kwidgetsaddons - kwindowsystem - kxmlgui - libinput - libICE - libSM - plasma-framework - qtdeclarative - qtscript - qtx11extras - udev - wayland + epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons + kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes + kinit kio knewstuff knotifications kpackage kservice kwayland + kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM + plasma-framework qtdeclarative qtscript qtx11extras udev wayland xcb-util-cursor ]; + propagatedBuildInputs = [ kactivities ]; patches = [ ./kwin-import-plugin-follow-symlinks.patch ]; postInstall = '' wrapKDEProgram "$out/bin/kwin_x11" diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index 76ddb520fed5..99932ba63c3f 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 kactivities kauth kcmutils + attica boost fontconfig kauth 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 ]; + propagatedBuildInputs = [ baloo kactivities ]; 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 27ae27012bc9..b5b479c2d5e6 100644 --- a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix +++ b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix @@ -10,9 +10,9 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kactivities kconfig kcoreaddons kdeclarative kguiaddons ki18n kio + kconfig kcoreaddons kdeclarative kguiaddons ki18n kio kservice kfilemetadata plasma-framework qtdeclarative qtmultimedia taglib ]; - propagatedBuildInputs = [ baloo ]; + propagatedBuildInputs = [ baloo kactivities ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index f1c44536a52e..900036a2867b 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -17,7 +17,7 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kactivities kcmutils kcrash kdbusaddons kdeclarative + kcmutils kcrash kdbusaddons kdeclarative kdelibs4support kdesu kdewebkit kglobalaccel kidletime kjsembed knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM @@ -25,7 +25,7 @@ plasmaPackage { qtscript qtx11extras solid wayland ]; propagatedBuildInputs = [ - baloo libksysguard + baloo kactivities libksysguard ]; 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 9427638936e5..48ca659c6f7b 100644 --- a/pkgs/desktops/plasma-5.4/powerdevil.nix +++ b/pkgs/desktops/plasma-5.4/powerdevil.nix @@ -1,21 +1,7 @@ -{ plasmaPackage -, extra-cmake-modules -, kdoctools -, kactivities -, kauth -, kconfig -, kdbusaddons -, kdelibs4support -, kglobalaccel -, ki18n -, kidletime -, kio -, knotifyconfig -, libkscreen -, plasma-workspace -, qtx11extras -, solid -, udev +{ plasmaPackage, extra-cmake-modules, kdoctools, kactivities +, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n +, kidletime, kio, knotifyconfig, libkscreen, plasma-workspace +, qtx11extras, solid, udev }: plasmaPackage { @@ -25,20 +11,9 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kactivities - kauth - kconfig - kdbusaddons - kdelibs4support - kglobalaccel - ki18n - kidletime - kio - knotifyconfig - libkscreen - plasma-workspace - qtx11extras - solid - udev + kauth kconfig kdbusaddons kdelibs4support kglobalaccel ki18n + kidletime kio knotifyconfig libkscreen plasma-workspace + qtx11extras solid udev ]; + propagatedBuildInputs = [ kactivities ]; } diff --git a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix index d838996f99c7..10ba63efdfd2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix @@ -1,36 +1,19 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kactivities -, karchive -, kconfig -, kconfigwidgets -, kcoreaddons -, kdbusaddons -, kdeclarative -, kdoctools -, kglobalaccel -, kguiaddons -, ki18n -, kiconthemes -, kio -, knotifications -, kpackage -, kservice -, kwindowsystem -, kxmlgui -, qtscript -, qtx11extras +{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive +, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative +, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio +, knotifications, kpackage, kservice, kwindowsystem, kxmlgui +, qtscript, qtx11extras }: kdeFramework { name = "plasma-framework"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kactivities karchive kconfig kconfigwidgets kcoreaddons + karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications kwindowsystem kxmlgui qtscript qtx11extras ]; - propagatedBuildInputs = [ kpackage kservice ]; + propagatedBuildInputs = [ kactivities kpackage kservice ]; postInstall = '' wrapKDEProgram "$out/bin/plasmapkg2" '';