diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-08-04 10:40:36 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-08-04 10:40:36 -0500 |
commit | 5b008e30b44923e8eff5dbe470b000de58f07021 (patch) | |
tree | f00322b41a3237959b84dcf02df116c21ef92a19 /pkgs/development/libraries | |
parent | c291485b7485db0882bdfbf2cdcb3118102b28c3 (diff) | |
download | nixlib-5b008e30b44923e8eff5dbe470b000de58f07021.tar nixlib-5b008e30b44923e8eff5dbe470b000de58f07021.tar.gz nixlib-5b008e30b44923e8eff5dbe470b000de58f07021.tar.bz2 nixlib-5b008e30b44923e8eff5dbe470b000de58f07021.tar.lz nixlib-5b008e30b44923e8eff5dbe470b000de58f07021.tar.xz nixlib-5b008e30b44923e8eff5dbe470b000de58f07021.tar.zst nixlib-5b008e30b44923e8eff5dbe470b000de58f07021.zip |
kdeWrapper: avoid excessive file collisions
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kde-env.nix | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kde-wrapper.nix | 8 |
2 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/kde-env.nix b/pkgs/development/libraries/kde-frameworks/kde-env.nix index c77ff49bfeaf..a48ba32be224 100644 --- a/pkgs/development/libraries/kde-frameworks/kde-env.nix +++ b/pkgs/development/libraries/kde-frameworks/kde-env.nix @@ -5,7 +5,7 @@ drv: pkgs: stdenv.mkDerivation { name = "kde-env-${drv.name}"; nativeBuildInputs = [ lndir ]; - propagatedUserEnvPkgs = builtins.map lib.getBin ([drv] ++ pkgs); + envPkgs = builtins.map lib.getBin ([drv] ++ pkgs); unpackPhase = "true"; configurePhase = "runHook preConfigure; runHook postConfigure"; buildPhase = "true"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { runHook preInstall propagated="" - for i in $propagatedUserEnvPkgs; do + for i in $envPkgs; do findInputs $i propagated propagated-user-env-packages done @@ -26,6 +26,15 @@ stdenv.mkDerivation { done done + for p in $propagated; do + for s in applications dbus-1 desktop-directories icons mime polkit-1; do + if [ -d "$p/share/$s" ]; then + propagatedUserEnvPkgs+=" $p" + break + fi + done + done + runHook postInstall ''; } diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix index 95f9cdcecb77..d340a5edbf7e 100644 --- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix +++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix @@ -37,11 +37,7 @@ stdenv.mkDerivation { fi done - for s in applications dbus-1 desktop-directories icons mime polkit-1; do - if [ -d "$env/share/$s" ]; then - mkdir -p "$out/share" - ln -s "$env/share/$s" "$out/share/$s" - fi - done + mkdir -p "$out/nix-support" + ln -s "$env/nix-support/propagated-user-env-packages" "$out/nix-support/" ''; } |