mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
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.
This commit is contained in:
parent
013b9a853b
commit
b45938a972
@ -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
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user