summary refs log tree commit diff
path: root/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-05-22 13:49:07 -0500
committerThomas Tuegel <ttuegel@mailbox.org>2017-06-18 08:44:45 -0500
commitfaf0d3e91d7a08a95a9dd8a7faa4d2f5ee5cb4eb (patch)
tree494e37aed0ec56df26ae359a4adad7dee117420d /pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
parent087f20e8c66372bdba86fa309dd4e1be3f35d821 (diff)
downloadnixpkgs-faf0d3e91d7a08a95a9dd8a7faa4d2f5ee5cb4eb.tar
nixpkgs-faf0d3e91d7a08a95a9dd8a7faa4d2f5ee5cb4eb.tar.gz
nixpkgs-faf0d3e91d7a08a95a9dd8a7faa4d2f5ee5cb4eb.tar.bz2
nixpkgs-faf0d3e91d7a08a95a9dd8a7faa4d2f5ee5cb4eb.tar.lz
nixpkgs-faf0d3e91d7a08a95a9dd8a7faa4d2f5ee5cb4eb.tar.xz
nixpkgs-faf0d3e91d7a08a95a9dd8a7faa4d2f5ee5cb4eb.tar.zst
nixpkgs-faf0d3e91d7a08a95a9dd8a7faa4d2f5ee5cb4eb.zip
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.
Diffstat (limited to 'pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix')
-rw-r--r--pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index 6fe57449b89..ba43a5668a7 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -10,10 +10,11 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [ qtx11extras ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qttools qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   preConfigure = ''
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"$out/$qtPluginPrefix\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\""
   '';
 }