diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-07-30 17:07:06 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-07-30 17:07:06 -0500 |
| commit | 22bc6f01cfaa86953802060138128a2783781b4d (patch) | |
| tree | 57d79b6e15f0abb67a5183f83d16a1ea2d804d19 /pkgs/development/libraries | |
| parent | aaf612e833e6813245dd1c913b2a121fcfca3e06 (diff) | |
| download | nixlib-22bc6f01cfaa86953802060138128a2783781b4d.tar nixlib-22bc6f01cfaa86953802060138128a2783781b4d.tar.gz nixlib-22bc6f01cfaa86953802060138128a2783781b4d.tar.bz2 nixlib-22bc6f01cfaa86953802060138128a2783781b4d.tar.lz nixlib-22bc6f01cfaa86953802060138128a2783781b4d.tar.xz nixlib-22bc6f01cfaa86953802060138128a2783781b4d.tar.zst nixlib-22bc6f01cfaa86953802060138128a2783781b4d.zip | |
kdeEnv: use package version, not ecm version
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/kde-env.nix | 11 |
2 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 5962c16860db..bf27d52dceb5 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -56,7 +56,6 @@ let kdeEnv = import ./kde-env.nix { inherit (pkgs) stdenv lib; inherit (pkgs.xorg) lndir; - inherit ecmNoHooks; }; kdeWrapper = import ./kde-wrapper.nix { diff --git a/pkgs/development/libraries/kde-frameworks/kde-env.nix b/pkgs/development/libraries/kde-frameworks/kde-env.nix index f4ad528454b2..c77ff49bfeaf 100644 --- a/pkgs/development/libraries/kde-frameworks/kde-env.nix +++ b/pkgs/development/libraries/kde-frameworks/kde-env.nix @@ -1,14 +1,11 @@ -{ stdenv, lib, lndir, ecmNoHooks }: +{ stdenv, lib, lndir }: -name: pkgs: +drv: pkgs: -let - inherit (builtins.parseDrvName ecmNoHooks.name) version; -in stdenv.mkDerivation { - name = "kde-env-${name}"; + name = "kde-env-${drv.name}"; nativeBuildInputs = [ lndir ]; - propagatedUserEnvPkgs = builtins.map lib.getBin pkgs; + propagatedUserEnvPkgs = builtins.map lib.getBin ([drv] ++ pkgs); unpackPhase = "true"; configurePhase = "runHook preConfigure; runHook postConfigure"; buildPhase = "true"; |