diff --git a/pkgs/development/libraries/kde-frameworks/kde-env.nix b/pkgs/development/libraries/kde-frameworks/kde-env.nix index a48ba32be22..5ddf89a0129 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 d340a5edbf7..153ca31fd62 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 ''; }