Merge pull request #74080 from Ericson2314/fix-kde

plasma5: Fix setup hook some more
This commit is contained in:
worldofpeace 2019-11-24 21:29:20 +00:00 committed by GitHub
commit e994b67a7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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
'';