kdeWrapper: reduce environment pollution

(cherry picked from commit a7c986c)
NixOS · Nov 8, 2016 · d4640eb · d4640eb
1 parent 3447232
commit d4640eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git 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
@@ -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
   '';
 }