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. --- .../libraries/kde-frameworks/kconfigwidgets/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'pkgs/development/libraries/kde-frameworks/kconfigwidgets') diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix index 2b91e003764..3943e5d6d49 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix @@ -1,17 +1,20 @@ { mkDerivation, lib, extra-cmake-modules, - kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons + kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons, qtbase, }: mkDerivation { name = "kconfigwidgets"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons - ]; + buildInputs = [ kguiaddons ki18n qtbase ]; + propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; + outputs = [ "out" "dev" ]; + preConfigure = '' + outputBin=dev + ''; postInstall = '' - moveToOutput "bin/preparetips5" "$dev" + moveToOutput share/man $dev ''; } -- cgit 1.4.1