From 7534be95be7ec01138d3ee83db29c890e1451e10 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 11:30:10 -0500 Subject: [PATCH] propagate kglobalaccel dependencies --- pkgs/desktops/plasma-5.4/khotkeys.nix | 11 +++---- pkgs/desktops/plasma-5.4/kscreen.nix | 24 +++----------- pkgs/desktops/plasma-5.4/kwin/default.nix | 10 +++--- .../plasma-5.4/plasma-desktop/default.nix | 3 +- pkgs/desktops/plasma-5.4/plasma-pa.nix | 4 +-- .../plasma-5.4/plasma-workspace/default.nix | 6 ++-- pkgs/desktops/plasma-5.4/powerdevil.nix | 9 ++--- .../kde-frameworks-5.14/kactivities.nix | 6 ++-- .../kde-frameworks-5.14/kdeclarative.nix | 4 +-- .../kde-frameworks-5.14/kdelibs4support.nix | 8 ++--- .../libraries/kde-frameworks-5.14/khtml.nix | 33 +++++-------------- .../libraries/kde-frameworks-5.14/kxmlgui.nix | 20 ++++------- .../plasma-framework/default.nix | 10 +++--- 13 files changed, 56 insertions(+), 92 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/khotkeys.nix b/pkgs/desktops/plasma-5.4/khotkeys.nix index dc1e73ccdfe2..8dfe4c089489 100644 --- a/pkgs/desktops/plasma-5.4/khotkeys.nix +++ b/pkgs/desktops/plasma-5.4/khotkeys.nix @@ -5,13 +5,10 @@ plasmaPackage { name = "khotkeys"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kdbusaddons kglobalaccel ki18n kio kxmlgui - plasma-framework plasma-workspace + kcmutils kdbusaddons ki18n kio kxmlgui plasma-framework + plasma-workspace ]; - propagatedBuildInputs = [ kdelibs4support qtx11extras ]; + propagatedBuildInputs = [ kdelibs4support kglobalaccel qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/kscreen.nix b/pkgs/desktops/plasma-5.4/kscreen.nix index f221f66f03f6..fb75548d8404 100644 --- a/pkgs/desktops/plasma-5.4/kscreen.nix +++ b/pkgs/desktops/plasma-5.4/kscreen.nix @@ -1,14 +1,6 @@ -{ plasmaPackage -, extra-cmake-modules -, kconfig -, kconfigwidgets -, kdbusaddons -, kglobalaccel -, ki18n -, kwidgetsaddons -, kxmlgui -, libkscreen -, qtdeclarative +{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets +, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui +, libkscreen, qtdeclarative }: plasmaPackage { @@ -17,16 +9,10 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kconfig - kconfigwidgets - kdbusaddons - kglobalaccel - ki18n - kwidgetsaddons - kxmlgui + kconfig kconfigwidgets kdbusaddons ki18n kwidgetsaddons kxmlgui libkscreen - qtdeclarative ]; + propagatedBuildInputs = [ kglobalaccel qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kscreen-console" ''; diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix index e01a5bfed013..051161c399fb 100644 --- a/pkgs/desktops/plasma-5.4/kwin/default.nix +++ b/pkgs/desktops/plasma-5.4/kwin/default.nix @@ -15,13 +15,13 @@ plasmaPackage { ]; buildInputs = [ epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons - kcrash kdecoration kglobalaccel ki18n kiconthemes - kinit kio knewstuff knotifications kpackage kservice kwayland - kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM - plasma-framework qtdeclarative qtscript qtx11extras udev wayland + kcrash kdecoration 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 kdeclarative ]; + propagatedBuildInputs = [ kactivities kdeclarative kglobalaccel ]; 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 1e8fd80e8cd6..e485262ab266 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -17,7 +17,7 @@ plasmaPackage { ]; buildInputs = [ attica boost fontconfig kcmutils kdbusaddons kded - kglobalaccel ki18n kitemmodels knewstuff knotifications + ki18n kitemmodels knewstuff knotifications knotifyconfig kpeople krunner kwallet kwin libcanberra_kde libXcursor libpulseaudio libXft libxkbfile phonon plasma-framework plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev @@ -25,6 +25,7 @@ plasmaPackage { ]; propagatedBuildInputs = [ baloo kactivities kauth kdeclarative kdelibs4support kemoticons + kglobalaccel ]; patches = [ (substituteAll { diff --git a/pkgs/desktops/plasma-5.4/plasma-pa.nix b/pkgs/desktops/plasma-5.4/plasma-pa.nix index a5cc11d89ae9..2525dde0bcb2 100644 --- a/pkgs/desktops/plasma-5.4/plasma-pa.nix +++ b/pkgs/desktops/plasma-5.4/plasma-pa.nix @@ -9,8 +9,8 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - glib kconfigwidgets kcoreaddons kglobalaccel ki18n libpulseaudio + glib kconfigwidgets kcoreaddons ki18n libpulseaudio plasma-framework ]; - propagatedBuildInputs = [ kdeclarative ]; + propagatedBuildInputs = [ kdeclarative kglobalaccel ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index a2ac1b69f01a..7d72e38203dc 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -17,15 +17,15 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kcmutils kcrash kdbusaddons - kdesu kdewebkit kglobalaccel kidletime kjsembed + kcmutils kcrash kdbusaddons kdesu kdewebkit kidletime kjsembed knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM libXcursor networkmanager-qt pam phonon plasma-framework qtquick1 qtscript qtx11extras solid wayland ]; propagatedBuildInputs = [ - baloo kactivities kdeclarative kdelibs4support libksysguard + baloo kactivities kdeclarative kdelibs4support kglobalaccel + 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 239b1c77318d..5ed8087d0ce9 100644 --- a/pkgs/desktops/plasma-5.4/powerdevil.nix +++ b/pkgs/desktops/plasma-5.4/powerdevil.nix @@ -11,9 +11,10 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kconfig kdbusaddons kglobalaccel ki18n - kidletime kio knotifyconfig libkscreen plasma-workspace - qtx11extras solid udev + kconfig kdbusaddons ki18n kidletime kio knotifyconfig libkscreen + plasma-workspace solid udev + ]; + propagatedBuildInputs = [ + kactivities kauth kdelibs4support kglobalaccel qtx11extras ]; - propagatedBuildInputs = [ kactivities kauth kdelibs4support ]; } diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix index ed0c7b6575ac..cc39129815f8 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix @@ -7,10 +7,10 @@ kdeFramework { name = "kactivities"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - boost kcmutils kconfig kcoreaddons kdbusaddons kglobalaccel ki18n - kio kservice kwindowsystem kxmlgui + boost kcmutils kconfig kcoreaddons kdbusaddons ki18n kio kservice + kwindowsystem kxmlgui ]; - propagatedBuildInputs = [ kdeclarative qtdeclarative ]; + propagatedBuildInputs = [ kdeclarative kglobalaccel qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kactivitymanagerd" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix index b62a13f8fa9f..10cd2d602a6b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix @@ -18,9 +18,9 @@ kdeFramework { name = "kdeclarative"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons kwindowsystem + epoxy kguiaddons ki18n kiconthemes kio kwidgetsaddons kwindowsystem ]; - propagatedBuildInputs = [ kconfig kpackage qtdeclarative ]; + propagatedBuildInputs = [ kconfig kglobalaccel kpackage qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kpackagelauncherqml" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix index cec5f268c21c..5deed2036b69 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix @@ -13,14 +13,14 @@ kdeFramework { name = "kdelibs4support"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcompletion kconfig kglobalaccel ki18n kio kservice kwidgetsaddons + kcompletion kconfig ki18n kio kservice kwidgetsaddons kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM ]; propagatedBuildInputs = [ kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons - kdesignerplugin kemoticons kguiaddons kiconthemes kitemmodels - kinit knotifications kparts ktextwidgets kunitconversion - kwindowsystem + kdesignerplugin kemoticons kglobalaccel kguiaddons kiconthemes + kitemmodels kinit knotifications kparts ktextwidgets + kunitconversion kwindowsystem ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix index 45dd45089c42..cbb511608edd 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix @@ -1,34 +1,19 @@ -{ kdeFramework, lib -, extra-cmake-modules -, giflib -, karchive -, kcodecs -, kglobalaccel -, ki18n -, kiconthemes -, kio -, kjs -, knotifications -, kparts -, ktextwidgets -, kwallet -, kwidgetsaddons -, kwindowsystem -, kxmlgui -, perl -, phonon -, qtx11extras -, sonnet +{ kdeFramework, lib, extra-cmake-modules, giflib, karchive +, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs +, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons +, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet }: kdeFramework { name = "khtml"; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ - giflib karchive kglobalaccel kiconthemes knotifications kwallet - kwidgetsaddons kwindowsystem kxmlgui phonon qtx11extras sonnet + giflib karchive kiconthemes knotifications kwallet kwidgetsaddons + kwindowsystem kxmlgui phonon qtx11extras sonnet + ]; + propagatedBuildInputs = [ + kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets ]; - propagatedBuildInputs = [ kcodecs ki18n kio kjs kparts ktextwidgets ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix index 6e1398d2f84b..3eeea735d822 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix @@ -1,24 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, attica -, kconfig -, kconfigwidgets -, kglobalaccel -, ki18n -, kiconthemes -, kitemviews -, ktextwidgets -, kwindowsystem -, sonnet +{ kdeFramework, lib, extra-cmake-modules, attica, kconfig +, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews +, ktextwidgets, kwindowsystem, sonnet }: kdeFramework { name = "kxmlgui"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes - kitemviews ktextwidgets kwindowsystem sonnet + attica kconfig kconfigwidgets ki18n kiconthemes kitemviews + ktextwidgets kwindowsystem sonnet ]; + propagatedBuildInputs = [ kglobalaccel ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; 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 f9479aa39f62..33eff0f424cc 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 @@ -9,11 +9,13 @@ kdeFramework { name = "plasma-framework"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - karchive kconfig kconfigwidgets kcoreaddons - kdbusaddons kglobalaccel kguiaddons ki18n kiconthemes - kio knotifications kwindowsystem kxmlgui qtscript qtx11extras + karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons + ki18n kiconthemes kio knotifications kwindowsystem kxmlgui + qtscript qtx11extras + ]; + propagatedBuildInputs = [ + kactivities kdeclarative kglobalaccel kpackage kservice ]; - propagatedBuildInputs = [ kactivities kdeclarative kpackage kservice ]; postInstall = '' wrapKDEProgram "$out/bin/plasmapkg2" '';