git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #74080 from Ericson2314/fix-kde

plasma5: Fix setup hook some more

commite994b67a7f81498294cd7e8bf462ebec6f19ce24 authorworldofpeace <worldofpeace@protonmail.ch> dateSun 24 Nov 2019, 21:29 (7 years ago) parent38178a9b45938a
1 file changed+3−3
pkgs/desktops/plasma-5/default.nix+3−3
pkgs/desktops/plasma-5/default.nix+3−3
@@ -43,11 +43,11 @@ let
4343 propagate = out:
4444 let setupHook = { writeScript }:
4545 writeScript "setup-hook" ''
46− if [ "''${hookName:-}" != postHook ]; then
46+ if [[ "''${hookName-}" != postHook ]]; then
4747 postHooks+=("source @dev@/nix-support/setup-hook")
4848 else
4949 # Propagate $${out} output
50− propagatedUserEnvPkgs="$propagatedUserEnvPkgs @${out}@"
50+ propagatedUserEnvPkgs+=" @${out}@"
5151
5252 if [ -z "$outputDev" ]; then
5353 echo "error: \$outputDev is unset!" >&2
@@ -57,7 +57,7 @@ let
5757 # Propagate $dev so that this setup hook is propagated
5858 # But only if there is a separate $dev output
5959 if [ "$outputDev" != out ]; then
60− propagatedBuildInputs="$propagatedBuildInputs @dev@"
60+ propagatedBuildInputs+=" @dev@"
6161 fi
6262 fi
6363 '';