Unverified Commit a7c986cf authored by Thomas Tuegel's avatar Thomas Tuegel
Browse files

kdeWrapper: reduce environment pollution

parent cf2654b2

pkgs/development/libraries/kde-frameworks/kde-env.nix

+0 −9
Original line number Diff line number Diff line
@@ -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

  '';

}

pkgs/development/libraries/kde-frameworks/kde-wrapper.nix

+8 −2
Original line number Diff line number Diff line
@@ -37,7 +37,13 @@ stdenv.mkDerivation { 
        fi

    done



    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 "$env/nix-support/propagated-user-env-packages" "$out/nix-support/"

        ln -s "$drv/nix-support/propagated-user-env-packages" "$out/nix-support/"

    fi

  '';

}