summary refs log tree commit diff
path: root/pkgs/development/libraries/kde-frameworks/default.nix
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2016-07-30 16:16:36 -0500
committerThomas Tuegel <ttuegel@gmail.com>2016-07-30 16:16:36 -0500
commitc122f791c95db53a0d86d0dffc9e4a7b2fda12bd (patch)
treea2c7aed8e83609ffa01711713c51918cfd561fdd /pkgs/development/libraries/kde-frameworks/default.nix
parent795cfd578a4ec8c9b78b39cf60102904a23af993 (diff)
downloadnixpkgs-c122f791c95db53a0d86d0dffc9e4a7b2fda12bd.tar
nixpkgs-c122f791c95db53a0d86d0dffc9e4a7b2fda12bd.tar.gz
nixpkgs-c122f791c95db53a0d86d0dffc9e4a7b2fda12bd.tar.bz2
nixpkgs-c122f791c95db53a0d86d0dffc9e4a7b2fda12bd.tar.lz
nixpkgs-c122f791c95db53a0d86d0dffc9e4a7b2fda12bd.tar.xz
nixpkgs-c122f791c95db53a0d86d0dffc9e4a7b2fda12bd.tar.zst
nixpkgs-c122f791c95db53a0d86d0dffc9e4a7b2fda12bd.zip
Add kdeEnv and kdeWrapper
Diffstat (limited to 'pkgs/development/libraries/kde-frameworks/default.nix')
-rw-r--r--pkgs/development/libraries/kde-frameworks/default.nix16
1 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 74e9df114f0..d5164297161 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -24,7 +24,10 @@ let
       let
       in stdenv.mkDerivation (args // {
 
-        outputs = args.outputs or [ "dev" "out" ];
+        outputs = args.outputs or [ "dev" "out" "bin" ];
+
+        propagatedUserEnvPkgs =
+          builtins.map lib.getBin (args.propagatedBuildInputs or []);
 
         cmakeFlags =
           (args.cmakeFlags or [])
@@ -50,6 +53,17 @@ let
         } // (args.meta or {});
       });
 
+    kdeEnv = import ./kde-env.nix {
+      inherit (pkgs) stdenv lib;
+      inherit (pkgs.xorg) lndir;
+      inherit ecmNoHooks;
+    };
+
+    kdeWrapper = import ./kde-wrapper.nix {
+      inherit (pkgs) stdenv lib makeWrapper;
+      inherit kdeEnv;
+    };
+
     attica = callPackage ./attica.nix {};
     baloo = callPackage ./baloo.nix {};
     bluez-qt = callPackage ./bluez-qt.nix {};