From faf0d3e91d7a08a95a9dd8a7faa4d2f5ee5cb4eb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 22 May 2017 13:49:07 -0500 Subject: kdeFrameworks: fixup inputs and outputs - Reduce environment pollution with a separate $bin output containing programs, plugins, and shared data. Libraries remain in $out and are not installed into the environment. - Only propagate build inputs as required. --- pkgs/desktops/plasma-5/bluedevil.nix | 3 +-- pkgs/desktops/plasma-5/breeze-qt5.nix | 6 ++++-- pkgs/desktops/plasma-5/kactivitymanagerd.nix | 2 +- pkgs/desktops/plasma-5/kde-cli-tools.nix | 10 +++++----- pkgs/desktops/plasma-5/kde-gtk-config/default.nix | 2 +- pkgs/desktops/plasma-5/kdeplasma-addons.nix | 16 ++++++++-------- pkgs/desktops/plasma-5/kgamma5.nix | 8 +++++--- pkgs/desktops/plasma-5/khotkeys.nix | 6 +++--- pkgs/desktops/plasma-5/kinfocenter.nix | 2 +- pkgs/desktops/plasma-5/kscreen.nix | 6 +++--- pkgs/desktops/plasma-5/kscreenlocker.nix | 5 +++-- pkgs/desktops/plasma-5/ksshaskpass.nix | 8 +++++--- pkgs/desktops/plasma-5/kwallet-pam.nix | 1 - pkgs/desktops/plasma-5/kwayland-integration.nix | 8 ++++++-- pkgs/desktops/plasma-5/kwrited.nix | 8 +++++--- pkgs/desktops/plasma-5/milou.nix | 14 ++++++++------ pkgs/desktops/plasma-5/oxygen.nix | 7 +++++-- pkgs/desktops/plasma-5/plasma-integration.nix | 14 +++++++------- pkgs/desktops/plasma-5/plasma-nm/default.nix | 19 ++++++++++--------- pkgs/desktops/plasma-5/plasma-pa.nix | 12 ++++++------ 20 files changed, 87 insertions(+), 70 deletions(-) (limited to 'pkgs/desktops/plasma-5') diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index 6db3e7879115..44e8a26eee15 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -7,11 +7,10 @@ mkDerivation { name = "bluedevil"; nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; - propagatedBuildInputs = [ + buildInputs = [ bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons kdbusaddons kded kiconthemes knotifications kwidgetsaddons ]; - propagatedUserEnvPkgs = [ bluez-qt.out ]; postInstall = '' # Fix the location of logic.js for the plasmoid ln -s $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/code/logic.js $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/ui/logic.js diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix index 11af6fff04b9..b1cb3b7f8fc2 100644 --- a/pkgs/desktops/plasma-5/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5/breeze-qt5.nix @@ -2,7 +2,8 @@ mkDerivation, extra-cmake-modules, frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, - kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtx11extras + kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtdeclarative, + qtx11extras }: mkDerivation { @@ -11,7 +12,8 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration - kguiaddons ki18n kwayland kwindowsystem plasma-framework qtx11extras + kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative + qtx11extras ]; cmakeFlags = [ "-DUSE_Qt4=OFF" ]; } diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix index 27f977ea7854..629718ab5a02 100644 --- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix +++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix @@ -7,7 +7,7 @@ mkDerivation { name = "kactivitymanagerd"; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ + buildInputs = [ boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem kxmlgui ]; diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix index e18481d6da93..6bcafc5813a9 100644 --- a/pkgs/desktops/plasma-5/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix @@ -1,14 +1,14 @@ { - mkDerivation, extra-cmake-modules, - kcmutils, kconfig, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes, - kwindowsystem, qtsvg, qtx11extras + mkDerivation, extra-cmake-modules, kdoctools, + kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem, + qtsvg, qtx11extras, }: mkDerivation { name = "kde-cli-tools"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kcmutils kconfig kdesu kdelibs4support ki18n kiconthemes kwindowsystem qtsvg + buildInputs = [ + kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index eaa2a906f823..5e959ac8b79c 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -16,7 +16,7 @@ mkDerivation { name = "kde-gtk-config"; patches = [ ./0001-follow-symlinks.patch ]; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ + buildInputs = [ ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes knewstuff ]; diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix index e3526d56c376..b9f40563ef64 100644 --- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix @@ -1,17 +1,17 @@ -{ mkDerivation, extra-cmake-modules, kdoctools -, kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n -, kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion -, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras -, ibus +{ + mkDerivation, + extra-cmake-modules, kdoctools, + kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n, kio, + knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus, + plasma-framework, plasma-workspace, qtdeclarative, qtx11extras, }: mkDerivation { name = "kdeplasma-addons"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ + buildInputs = [ kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff - kross krunner kservice ksysguard kunitconversion plasma-framework + kross krunner kservice ksysguard kunitconversion ibus plasma-framework plasma-workspace qtdeclarative qtx11extras - ibus ]; } diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix index 8199b5d03305..ea58cad12ae0 100644 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ b/pkgs/desktops/plasma-5/kgamma5.nix @@ -1,9 +1,11 @@ -{ mkDerivation, extra-cmake-modules, kdoctools, kdelibs4support -, qtx11extras +{ + mkDerivation, + extra-cmake-modules, kdoctools, + kconfig, kconfigwidgets, ki18n, qtx11extras, }: mkDerivation { name = "kgamma5"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kdelibs4support qtx11extras ]; + buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index 32d9c14ddefc..be4ccc7b2309 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -7,8 +7,8 @@ mkDerivation { name = "khotkeys"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace - qtx11extras kcmutils kdbusaddons kxmlgui + buildInputs = [ + kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui + plasma-framework plasma-workspace qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index ee6aa6aebdac..d366aa4b36e4 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -9,7 +9,7 @@ mkDerivation { name = "kinfocenter"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ + buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice kwayland kwidgetsaddons kxmlgui libraw1394 mesa_glu pciutils solid diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix index 93dd0e710508..fcdc922ff946 100644 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ b/pkgs/desktops/plasma-5/kscreen.nix @@ -6,8 +6,8 @@ mkDerivation { name = "kscreen"; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - kglobalaccel ki18n libkscreen qtdeclarative qtgraphicaleffects kconfig - kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui + buildInputs = [ + kconfig kconfigwidgets kdbusaddons kglobalaccel ki18n kwidgetsaddons kxmlgui + libkscreen qtdeclarative qtgraphicaleffects ]; } diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix index 64ea46905138..631719fb5354 100644 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -2,7 +2,8 @@ mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime, - kwayland, libXcursor, pam, plasma-framework, qtdeclarative, wayland + kwayland, libXcursor, pam, plasma-framework, qtdeclarative, qtx11extras, + wayland, }: mkDerivation { @@ -10,6 +11,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland - libXcursor pam plasma-framework qtdeclarative wayland + libXcursor pam plasma-framework qtdeclarative qtx11extras wayland ]; } diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix index 94bc5a35da03..39e260f6c708 100644 --- a/pkgs/desktops/plasma-5/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5/ksshaskpass.nix @@ -1,9 +1,11 @@ -{ mkDerivation, extra-cmake-modules, kdoctools, kcoreaddons -, ki18n, kwallet, kwidgetsaddons +{ + mkDerivation, + extra-cmake-modules, kdoctools, + kcoreaddons, ki18n, kwallet, kwidgetsaddons, qtbase, }: mkDerivation { name = "ksshaskpass"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ]; + buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ]; } diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix index d555701c76d5..1cbfb87ea563 100644 --- a/pkgs/desktops/plasma-5/kwallet-pam.nix +++ b/pkgs/desktops/plasma-5/kwallet-pam.nix @@ -2,7 +2,6 @@ mkDerivation { name = "kwallet-pam"; - nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ pam socat libgcrypt qtbase ]; postPatch = '' diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix index e5d00eb0800e..1344b477f736 100644 --- a/pkgs/desktops/plasma-5/kwayland-integration.nix +++ b/pkgs/desktops/plasma-5/kwayland-integration.nix @@ -1,7 +1,11 @@ -{ mkDerivation , extra-cmake-modules , kidletime , kwayland , kwindowsystem }: +{ + mkDerivation, + extra-cmake-modules, + kidletime, kwayland, kwindowsystem, qtbase, +}: mkDerivation { name = "kwayland-integration"; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ kidletime kwindowsystem kwayland ]; + buildInputs = [ kidletime kwindowsystem kwayland qtbase ]; } diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix index 18c4a4af8dbc..f6f6187e9462 100644 --- a/pkgs/desktops/plasma-5/kwrited.nix +++ b/pkgs/desktops/plasma-5/kwrited.nix @@ -1,9 +1,11 @@ -{ mkDerivation, extra-cmake-modules, kcoreaddons, ki18n, kpty -, knotifications, kdbusaddons +{ + mkDerivation, + extra-cmake-modules, + kcoreaddons, kdbusaddons, ki18n, knotifications, kpty, qtbase, }: mkDerivation { name = "kwrited"; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ]; + buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ]; } diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix index abc35279aba5..7f38b74423c4 100644 --- a/pkgs/desktops/plasma-5/milou.nix +++ b/pkgs/desktops/plasma-5/milou.nix @@ -1,6 +1,8 @@ -{ mkDerivation, extra-cmake-modules, qtscript, qtdeclarative -, kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework -, krunner +{ + mkDerivation, + extra-cmake-modules, + kcoreaddons, kdeclarative, ki18n, krunner, kservice, plasma-framework, + qtscript, qtdeclarative, }: mkDerivation { @@ -8,8 +10,8 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ - kdeclarative ki18n krunner plasma-framework qtdeclarative qtscript - kcoreaddons kservice + buildInputs = [ + kcoreaddons kdeclarative ki18n krunner kservice plasma-framework + qtdeclarative qtscript ]; } diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix index 483d987686a5..97421191d905 100644 --- a/pkgs/desktops/plasma-5/oxygen.nix +++ b/pkgs/desktops/plasma-5/oxygen.nix @@ -2,7 +2,8 @@ mkDerivation, extra-cmake-modules, frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons, - ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras + ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtdeclarative, + qtx11extras }: mkDerivation { @@ -10,6 +11,8 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons - ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras + ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative + qtx11extras ]; + outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/desktops/plasma-5/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration.nix index 2bca3943c349..de46bb4373c6 100644 --- a/pkgs/desktops/plasma-5/plasma-integration.nix +++ b/pkgs/desktops/plasma-5/plasma-integration.nix @@ -1,17 +1,17 @@ -{ mkDerivation, extra-cmake-modules -, breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland -, libXcursor +{ + mkDerivation, + extra-cmake-modules, + breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications, + kwayland, libXcursor }: # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration mkDerivation { name = "plasma-integration"; - nativeBuildInputs = [ - extra-cmake-modules - ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - breeze-qt5 kconfig kconfigwidgets kiconthemes kio kwayland + breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland libXcursor ]; } diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index 5c343548fcfb..8ff98ecfc1df 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -1,10 +1,11 @@ -{ mkDerivation, substituteAll, extra-cmake-modules, kdoctools -, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative -, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews -, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem -, kxmlgui, mobile_broadband_provider_info -, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework -, qca-qt5, qtdeclarative, solid, openvpn +{ + mkDerivation, substituteAll, + extra-cmake-modules, kdoctools, + kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, + kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews, knotifications, + kservice, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, + mobile_broadband_provider_info, modemmanager-qt, networkmanager-qt, + openconnect, openvpn, plasma-framework, qca-qt5, qtdeclarative, qttools, solid }: mkDerivation { @@ -19,8 +20,8 @@ mkDerivation { inherit openvpn; }) ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; + buildInputs = [ kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index ec40ffb96308..50f53d70a987 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -1,15 +1,15 @@ { mkDerivation, - extra-cmake-modules, - gconf, glib, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, - ki18n, libcanberra_gtk3, libpulseaudio, plasma-framework + extra-cmake-modules, kdoctools, + gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, + libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative }: mkDerivation { name = "plasma-pa"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - gconf glib kconfigwidgets kcoreaddons kdeclarative - kglobalaccel ki18n libcanberra_gtk3 libpulseaudio plasma-framework + buildInputs = [ + gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n + libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative ]; } -- cgit 1.4.1