summaryrefslogtreecommitdiffstats
path: root/pkgs/desktops/plasma-5
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2019-11-24 15:58:51 -0500
committerJohn Ericson <git@JohnEricson.me>2019-11-24 15:58:51 -0500
commitb45938a972386c626dc61231856438e44d481adc (patch)
tree4b641a6a3c079668be4e2d11aa1953d76b10b7eb /pkgs/desktops/plasma-5
parent013b9a853bbfb7ba00a88e49e48f8df4730b10ff (diff)
plasma5: Fix setup hook some more
1. `[[...]]` is more robust wrt empty expansions than `[..]` 2. `${foo-}` is simpler and won't accidentally be a url compared to `${foo:-}` 3. `+=` works even when the variable is undefined.
Diffstat (limited to 'pkgs/desktops/plasma-5')
-rw-r--r--pkgs/desktops/plasma-5/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index d80f51831fd9..a199a4a959db 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -43,11 +43,11 @@ let
propagate = out:
let setupHook = { writeScript }:
writeScript "setup-hook" ''
- if [ "''${hookName:-}" != postHook ]; then
+ if [[ "''${hookName-}" != postHook ]]; then
postHooks+=("source @dev@/nix-support/setup-hook")
else
# Propagate $${out} output
- propagatedUserEnvPkgs="$propagatedUserEnvPkgs @${out}@"
+ propagatedUserEnvPkgs+=" @${out}@"
if [ -z "$outputDev" ]; then
echo "error: \$outputDev is unset!" >&2
@@ -57,7 +57,7 @@ let
# Propagate $dev so that this setup hook is propagated
# But only if there is a separate $dev output
if [ "$outputDev" != out ]; then
- propagatedBuildInputs="$propagatedBuildInputs @dev@"
+ propagatedBuildInputs+=" @dev@"
fi
fi
'';