public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kdeEnv: use package version, not ecm version

Browse Source
This commit is contained in:
Thomas Tuegel 2016-07-30 17:07:06 -05:00
parent aaf612e833
commit 22bc6f01cf
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/kde-frameworks/default.nix
View File

@ -56,7 +56,6 @@ let
kdeEnv = import ./kde-env.nix { kdeEnv = import ./kde-env.nix {
inherit (pkgs) stdenv lib; inherit (pkgs) stdenv lib;
inherit (pkgs.xorg) lndir; inherit (pkgs.xorg) lndir;
inherit ecmNoHooks;
}; };
kdeWrapper = import ./kde-wrapper.nix { kdeWrapper = import ./kde-wrapper.nix {

11
pkgs/development/libraries/kde-frameworks/kde-env.nix
View File

@ -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 { stdenv.mkDerivation {
name = "kde-env-${name}"; name = "kde-env-${drv.name}";
nativeBuildInputs = [ lndir ]; nativeBuildInputs = [ lndir ];
propagatedUserEnvPkgs = builtins.map lib.getBin pkgs; propagatedUserEnvPkgs = builtins.map lib.getBin ([drv] ++ pkgs);
unpackPhase = "true"; unpackPhase = "true";
configurePhase = "runHook preConfigure; runHook postConfigure"; configurePhase = "runHook preConfigure; runHook postConfigure";
buildPhase = "true"; buildPhase = "true";