diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-22 13:49:07 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:44:45 -0500 |
commit | faf0d3e91d7a08a95a9dd8a7faa4d2f5ee5cb4eb (patch) | |
tree | 494e37aed0ec56df26ae359a4adad7dee117420d | |
parent | 087f20e8c66372bdba86fa309dd4e1be3f35d821 (diff) |
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.
106 files changed, 533 insertions, 338 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 0a64429c24f6..f099117f4777 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -52,8 +52,8 @@ in }; security.wrappers = { - kcheckpass.source = "${plasma5.plasma-workspace.out}/lib/libexec/kcheckpass"; - "start_kdeinit".source = "${pkgs.kinit.out}/lib/libexec/kf5/start_kdeinit"; + kcheckpass.source = "${lib.getBin plasma5.plasma-workspace}/lib/libexec/kcheckpass"; + "start_kdeinit".source = "${lib.getBin pkgs.kinit}/lib/libexec/kf5/start_kdeinit"; }; environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications; diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix index 7d017f6496fd..3f410b7b8b91 100644 --- a/pkgs/applications/kde/akonadi-contacts.nix +++ b/pkgs/applications/kde/akonadi-contacts.nix @@ -1,8 +1,8 @@ { mkDerivation, lib, extra-cmake-modules, - akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine, - akonadi + akonadi, akonadi-mime, grantlee, kcontacts, kdbusaddons, ki18n, kiconthemes, + kio, kitemmodels, kmime, ktextwidgets, qtwebengine, }: mkDerivation { @@ -13,7 +13,9 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - akonadi-mime grantlee kcontacts kio kitemmodels kmime qtwebengine + akonadi-mime grantlee kcontacts kdbusaddons ki18n kiconthemes kio + kitemmodels kmime ktextwidgets qtwebengine ]; propagatedBuildInputs = [ akonadi ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix index 390ef373528a..1fb50756665e 100644 --- a/pkgs/applications/kde/akonadi-mime.nix +++ b/pkgs/applications/kde/akonadi-mime.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, - akonadi, kdbusaddons, kio, kitemmodels, kmime + akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime }: mkDerivation { @@ -11,5 +11,6 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ akonadi kdbusaddons kio kitemmodels kmime ]; + buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index f2976c38c39b..df15f6b0f188 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -3,8 +3,8 @@ extra-cmake-modules, kdoctools, - karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio, - kservice, kpty, kwidgetsaddons, libarchive, kitemmodels, + karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, kitemmodels, + khtml, kio, kparts, kpty, kservice, kwidgetsaddons, libarchive, # Archive tools p7zip, unzipNLS, zip, @@ -17,9 +17,10 @@ mkDerivation { name = "ark"; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; propagatedBuildInputs = [ - khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice - kpty kwidgetsaddons libarchive kitemmodels + karchive kconfig kcrash kdbusaddons khtml ki18n kiconthemes kio kitemmodels + kparts kpty kservice kwidgetsaddons libarchive ]; + outputs = [ "out" "dev" ]; postFixup = let PATH = diff --git a/pkgs/applications/kde/baloo-widgets.nix b/pkgs/applications/kde/baloo-widgets.nix index 17ae75cc479e..3479b6600fc9 100644 --- a/pkgs/applications/kde/baloo-widgets.nix +++ b/pkgs/applications/kde/baloo-widgets.nix @@ -14,4 +14,5 @@ mkDerivation { propagatedBuildInputs = [ baloo kconfig kdelibs4support kfilemetadata ki18n kio kservice ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index ff5be6fdd884..2570e37bf2c9 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -20,4 +20,5 @@ mkDerivation { kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem phonon solid ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix index 99be13ba7f88..233566c1bdaf 100644 --- a/pkgs/applications/kde/gwenview.nix +++ b/pkgs/app |