diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-11-08 15:00:09 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-11-08 15:00:31 -0600 |
| commit | a7c986cf69927a24de1eba280ad699f066749b8f (patch) | |
| tree | 519553dcc7b80422c67e9f74570b778b7143ae8b /pkgs/development/libraries | |
| parent | cf2654b2e0dedd31c6ec14458953c85530db8cec (diff) | |
| download | nixlib-a7c986cf69927a24de1eba280ad699f066749b8f.tar nixlib-a7c986cf69927a24de1eba280ad699f066749b8f.tar.gz nixlib-a7c986cf69927a24de1eba280ad699f066749b8f.tar.bz2 nixlib-a7c986cf69927a24de1eba280ad699f066749b8f.tar.lz nixlib-a7c986cf69927a24de1eba280ad699f066749b8f.tar.xz nixlib-a7c986cf69927a24de1eba280ad699f066749b8f.tar.zst nixlib-a7c986cf69927a24de1eba280ad699f066749b8f.zip | |
kdeWrapper: reduce environment pollution
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/kde-env.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/kde-wrapper.nix | 10 |
2 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/kde-env.nix b/pkgs/development/libraries/kde-frameworks/kde-env.nix index a48ba32be224..5ddf89a0129f 100644 --- a/pkgs/development/libraries/kde-frameworks/kde-env.nix +++ b/pkgs/development/libraries/kde-frameworks/kde-env.nix @@ -26,15 +26,6 @@ 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 d340a5edbf7e..153ca31fd625 100644 --- a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix +++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix @@ -37,7 +37,13 @@ stdenv.mkDerivation { fi done - mkdir -p "$out/nix-support" - ln -s "$env/nix-support/propagated-user-env-packages" "$out/nix-support/" + if [ -a "$drv/share" ]; then + ln -s "$drv/share" "$out" + fi + + if [ -a "$drv/nix-support/propagated-user-env-packages" ]; then + mkdir -p "$out/nix-support" + ln -s "$drv/nix-support/propagated-user-env-packages" "$out/nix-support/" + fi ''; } |