3
0
Fork 0
forked from mirrors/nixpkgs

kdeWrapper: reduce environment pollution

This commit is contained in:
Thomas Tuegel 2016-11-08 15:00:09 -06:00
parent cf2654b2e0
commit a7c986cf69
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59
2 changed files with 8 additions and 11 deletions

View file

@ -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
'';
}

View file

@ -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
'';
}