diff options
27 files changed, 58 insertions, 50 deletions
diff --git a/pkgs/applications/kde-apps-15.08/dolphin.nix b/pkgs/applications/kde-apps-15.08/dolphin.nix index e5a0857c7f4..102108a057c 100644 --- a/pkgs/applications/kde-apps-15.08/dolphin.nix +++ b/pkgs/applications/kde-apps-15.08/dolphin.nix @@ -44,7 +44,6 @@ kdeApp { solid kiconthemes kcompletion - kwindowsystem knotifications phonon baloo-widgets @@ -57,6 +56,7 @@ kdeApp { ki18n kio ktexteditor + kwindowsystem ]; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; diff --git a/pkgs/applications/kde-apps-15.08/kate.nix b/pkgs/applications/kde-apps-15.08/kate.nix index 1053d97d412..b8220ce9c1f 100644 --- a/pkgs/applications/kde-apps-15.08/kate.nix +++ b/pkgs/applications/kde-apps-15.08/kate.nix @@ -41,7 +41,6 @@ kdeApp { kinit kjobwidgets kparts - kwindowsystem kxmlgui kdbusaddons kwallet @@ -57,6 +56,7 @@ kdeApp { ki18n kio ktexteditor + kwindowsystem ]; meta = { license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; diff --git a/pkgs/applications/kde-apps-15.08/konsole.nix b/pkgs/applications/kde-apps-15.08/konsole.nix index 4ad675c0432..ce98c17443f 100644 --- a/pkgs/applications/kde-apps-15.08/konsole.nix +++ b/pkgs/applications/kde-apps-15.08/konsole.nix @@ -49,12 +49,12 @@ kdeApp { kservice ktextwidgets kwidgetsaddons - kwindowsystem kxmlgui ]; propagatedBuildInputs = [ kdelibs4support ki18n + kwindowsystem ]; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; diff --git a/pkgs/applications/kde-apps-15.08/print-manager.nix b/pkgs/applications/kde-apps-15.08/print-manager.nix index ef4a9f40134..c73094e258e 100644 --- a/pkgs/applications/kde-apps-15.08/print-manager.nix +++ b/pkgs/applications/kde-apps-15.08/print-manager.nix @@ -32,12 +32,12 @@ kdeApp { knotifications plasma-framework kwidgetsaddons - kwindowsystem kitemviews ]; propagatedBuildInputs = [ ki18n kio + kwindowsystem qtdeclarative ]; meta = { diff --git a/pkgs/desktops/plasma-5.4/breeze-qt5.nix b/pkgs/desktops/plasma-5.4/breeze-qt5.nix index f526d2ebc9f..6e878b42858 100644 --- a/pkgs/desktops/plasma-5.4/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5.4/breeze-qt5.nix @@ -11,9 +11,8 @@ plasmaPackage { ]; buildInputs = [ kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons - kwindowsystem qtx11extras ]; - propagatedBuildInputs = [ frameworkintegration ki18n ]; + propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ]; cmakeFlags = [ "-DUSE_KDE4=OFF" ]; postInstall = '' wrapKDEProgram "$out/bin/breeze-settings5" diff --git a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix index 002186f7d2a..56676a9c52e 100644 --- a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix @@ -7,9 +7,11 @@ plasmaPackage { name = "kde-cli-tools"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kconfig kdesu kiconthemes kwindowsystem + kcmutils kconfig kdesu kiconthemes + ]; + propagatedBuildInputs = [ + kdelibs4support ki18n kwindowsystem qtsvg qtx11extras ]; - propagatedBuildInputs = [ kdelibs4support ki18n qtsvg qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/kmimetypefinder5" wrapKDEProgram "$out/bin/ksvgtopng5" diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix index 33653ab9ef2..96cc3166ab7 100644 --- a/pkgs/desktops/plasma-5.4/kwin/default.nix +++ b/pkgs/desktops/plasma-5.4/kwin/default.nix @@ -16,11 +16,13 @@ plasmaPackage { buildInputs = [ epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons kcrash kdecoration kiconthemes kinit knewstuff knotifications - kpackage kservice kwayland kwidgetsaddons kwindowsystem kxmlgui - libinput libICE libSM plasma-framework qtdeclarative qtscript - qtx11extras udev wayland xcb-util-cursor + kpackage kservice kwayland kwidgetsaddons kxmlgui libinput libICE + libSM plasma-framework qtscript udev wayland xcb-util-cursor + ]; + propagatedBuildInputs = [ + kactivities kdeclarative kglobalaccel ki18n kio kwindowsystem + qtdeclarative qtx11extras ]; - propagatedBuildInputs = [ kactivities kdeclarative kglobalaccel ki18n kio ]; patches = [ ./kwin-import-plugin-follow-symlinks.patch ]; postInstall = '' wrapKDEProgram "$out/bin/kwin_x11" diff --git a/pkgs/desktops/plasma-5.4/libksysguard.nix b/pkgs/desktops/plasma-5.4/libksysguard.nix index afcb8a35b7c..e38c251abea 100644 --- a/pkgs/desktops/plasma-5.4/libksysguard.nix +++ b/pkgs/desktops/plasma-5.4/libksysguard.nix @@ -11,10 +11,9 @@ plasmaPackage { ]; buildInputs = [ kcompletion kconfigwidgets kcoreaddons kservice - kwidgetsaddons kwindowsystem plasma-framework qtscript qtwebkit - qtx11extras + kwidgetsaddons plasma-framework qtscript qtwebkit ]; propagatedBuildInputs = [ - kauth kconfig ki18n kiconthemes + kauth kconfig ki18n kiconthemes kwindowsystem qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/oxygen.nix b/pkgs/desktops/plasma-5.4/oxygen.nix index 882a5ea582b..da2a6cab4b0 100644 --- a/pkgs/desktops/plasma-5.4/oxygen.nix +++ b/pkgs/desktops/plasma-5.4/oxygen.nix @@ -10,9 +10,9 @@ plasmaPackage { ]; buildInputs = [ kcmutils kconfig kdecoration kguiaddons kwidgetsaddons - kservice kcompletion kwindowsystem qtx11extras + kservice kcompletion ]; - propagatedBuildInputs = [ frameworkintegration ki18n ]; + propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/oxygen-demo5" wrapKDEProgram "$out/bin/oxygen-settings5" diff --git a/pkgs/desktops/plasma-5.4/plasma-nm.nix b/pkgs/desktops/plasma-5.4/plasma-nm.nix index 5a4af534d31..ed4f5aea683 100644 --- a/pkgs/desktops/plasma-5.4/plasma-nm.nix +++ b/pkgs/desktops/plasma-5.4/plasma-nm.nix @@ -16,11 +16,13 @@ plasmaPackage { buildInputs = [ kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes kinit kitemviews knotifications kservice kwallet - kwidgetsaddons kwindowsystem kxmlgui + kwidgetsaddons kxmlgui mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect plasma-framework solid ]; - propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio qtdeclarative ]; + propagatedBuildInputs = [ + kdeclarative kdelibs4support ki18n kio kwindowsystem qtdeclarative + ]; postInstall = '' wrapKDEProgram "$out/bin/kde5-nm-connection-editor" ''; diff --git a/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix b/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix index c1c57657a6b..0173ec65516 100644 --- a/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix @@ -18,7 +18,6 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kwindowsystem kdbusaddons kwidgetsaddons kcoreaddons @@ -28,5 +27,5 @@ plasmaPackage { knotifications polkitQt ]; - propagatedBuildInputs = [ ki18n ]; + propagatedBuildInputs = [ ki18n kwindowsystem ]; } diff --git a/pkgs/desktops/plasma-5.4/systemsettings.nix b/pkgs/desktops/plasma-5.4/systemsettings.nix index 4c132e34f39..e5617e1e5df 100644 --- a/pkgs/desktops/plasma-5.4/systemsettings.nix +++ b/pkgs/desktops/plasma-5.4/systemsettings.nix @@ -10,10 +10,10 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kitemviews kcmutils kservice kiconthemes kwindowsystem - kxmlgui kdbusaddons kconfig + kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons + kconfig ]; - propagatedBuildInputs = [ khtml ki18n kio ]; + propagatedBuildInputs = [ khtml ki18n kio kwindowsystem ]; postInstall = '' wrapKDEProgram "$out/bin/systemsettings5" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix index fca69adf7dd..3cdc3c4144d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix @@ -8,10 +8,10 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ boost kcmutils kconfig kcoreaddons kdbusaddons kservice - kwindowsystem kxmlgui + kxmlgui ]; propagatedBuildInputs = [ - kdeclarative kglobalaccel ki18n kio qtdeclarative + kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kactivitymanagerd" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.14/kcrash.nix index b919c7ad222..bbab78ccb40 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kcrash.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kcrash.nix @@ -8,7 +8,8 @@ kdeFramework { name = "kcrash"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kwindowsystem qtx11extras ]; + buildInputs = [ kcoreaddons ]; + propagatedBuildInputs = [ kwindowsystem qtx11extras ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdbusaddons.nix index eb76e14705e..ed046e58262 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdbusaddons.nix @@ -6,7 +6,7 @@ kdeFramework { name = "kdbusaddons"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; + propagatedBuildInputs = [ qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/kquitapp5" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix index 674587ba48e..aaeb97a067b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix @@ -7,9 +7,11 @@ kdeFramework { name = "kdeclarative"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - epoxy kguiaddons kiconthemes kwidgetsaddons kwindowsystem + epoxy kguiaddons kiconthemes kwidgetsaddons + ]; + propagatedBuildInputs = [ + kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative ]; - propagatedBuildInputs = [ kconfig kglobalaccel ki18n kio kpackage qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kpackagelauncherqml" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.14/kglobalaccel.nix index f7c5ea56266..32f71a7e3dc 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kglobalaccel.nix @@ -11,7 +11,8 @@ kdeFramework { name = "kglobalaccel"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras ]; + buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ]; + propagatedBuildInputs = [ kwindowsystem qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/kglobalaccel5" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix index cbb511608ed..c7ac8f8b3b4 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/khtml.nix @@ -9,10 +9,10 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ giflib karchive kiconthemes knotifications kwallet kwidgetsaddons - kwindowsystem kxmlgui phonon qtx11extras sonnet + kxmlgui phonon qtx11extras sonnet ]; propagatedBuildInputs = [ - kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets + kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets kwindowsystem ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix index da4d1de5218..5f644d7c424 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix @@ -8,8 +8,8 @@ kdeFramework { name = "kinit"; nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ]; - buildInputs = [ kconfig kcrash kservice kwindowsystem libcap ]; - propagatedBuildInputs = [ ki18n kio ]; + buildInputs = [ kconfig kcrash kservice libcap ]; + propagatedBuildInputs = [ ki18n kio kwindowsystem ]; patches = [ ./0001-kinit-libpath.patch ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kio.nix b/pkgs/development/libraries/kde-frameworks-5.14/kio.nix index b81be46b5d5..58d5667a50e 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kio.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kio.nix @@ -11,12 +11,12 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ acl karchive kconfig kcoreaddons kdbusaddons kiconthemes - knotifications ktextwidgets kwallet kwidgetsaddons kwindowsystem + knotifications ktextwidgets kwallet kwidgetsaddons qtscript ]; propagatedBuildInputs = [ kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets - kservice kxmlgui solid qtx11extras + kservice kwindowsystem kxmlgui solid qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/kcookiejar5" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.14/kjobwidgets.nix index c3f1d37f858..746edf12eea 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kjobwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kjobwidgets.nix @@ -8,7 +8,8 @@ kdeFramework { name = "kjobwidgets"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ]; + buildInputs = [ kcoreaddons kwidgetsaddons ]; + propagatedBuildInputs = [ qtx11extras ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.14/knotifications.nix index f3aa29f018c..7e301dd0f26 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/knotifications.nix @@ -12,9 +12,9 @@ kdeFramework { name = "knotifications"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kcodecs kconfig kcoreaddons kwindowsystem - phonon qtx11extras + kcodecs kconfig kcoreaddons phonon ]; + propagatedBuildInputs = [ kwindowsystem qtx11extras ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix index b1c47ec53d6..ba1bd03f9df 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix @@ -6,8 +6,8 @@ kdeFramework { name = "kservice"; setupHook = ./setup-hook.sh; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kcoreaddons kcrash kdbusaddons kwindowsystem ]; - propagatedBuildInputs = [ kconfig ki18n ]; + buildInputs = [ kcoreaddons kcrash kdbusaddons ]; + propagatedBuildInputs = [ kconfig ki18n kwindowsystem ]; patches = [ ./kservice-kbuildsycoca-follow-symlinks.patch ./kservice-kbuildsycoca-no-canonicalize-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix index 5ef2353a361..e332d4ff9a8 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix @@ -7,9 +7,9 @@ kdeFramework { name = "ktextwidgets"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem + kcompletion kconfig kconfigwidgets kiconthemes kservice ]; - propagatedBuildInputs = [ ki18n sonnet ]; + propagatedBuildInputs = [ ki18n kwindowsystem sonnet ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix index e028a94b017..77f1c5d05e6 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix @@ -8,9 +8,9 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kiconthemes knotifications - kservice kwidgetsaddons kwindowsystem libgcrypt + kservice kwidgetsaddons libgcrypt ]; - propagatedBuildInputs = [ ki18n ]; + propagatedBuildInputs = [ ki18n kwindowsystem ]; postInstall = '' wrapKDEProgram "$out/bin/kwalletd5" wrapKDEProgram "$out/bin/kwallet-query" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix index 69a59f0c417..51a38c2688b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix @@ -8,9 +8,9 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ attica kconfig kconfigwidgets kiconthemes kitemviews - ktextwidgets kwindowsystem sonnet + ktextwidgets sonnet ]; - propagatedBuildInputs = [ kglobalaccel ki18n ]; + propagatedBuildInputs = [ kglobalaccel ki18n kwindowsystem ]; 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 0e53e1c13f8..a47b904d25d 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 @@ -10,10 +10,10 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons - kiconthemes knotifications kwindowsystem kxmlgui qtscript + kiconthemes knotifications kxmlgui qtscript ]; propagatedBuildInputs = [ - kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice + kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem qtx11extras ]; postInstall = '' |