diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-11-24 21:29:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-24 21:29:20 +0000 |
| commit | e994b67a7f81498294cd7e8bf462ebec6f19ce24 (patch) | |
| tree | cf092818aebbbf875b56e282f74ef947253cab68 | |
| parent | 38178a9a5bf9c7c76e7c1e53b9ff12d0bd272e4f (diff) | |
| parent | b45938a972386c626dc61231856438e44d481adc (diff) | |
| download | nixpkgs-e994b67a7f81498294cd7e8bf462ebec6f19ce24.tar nixpkgs-e994b67a7f81498294cd7e8bf462ebec6f19ce24.tar.gz nixpkgs-e994b67a7f81498294cd7e8bf462ebec6f19ce24.tar.bz2 nixpkgs-e994b67a7f81498294cd7e8bf462ebec6f19ce24.tar.lz nixpkgs-e994b67a7f81498294cd7e8bf462ebec6f19ce24.tar.xz nixpkgs-e994b67a7f81498294cd7e8bf462ebec6f19ce24.tar.zst nixpkgs-e994b67a7f81498294cd7e8bf462ebec6f19ce24.zip | |
Merge pull request #74080 from Ericson2314/fix-kde
plasma5: Fix setup hook some more
| -rw-r--r-- | pkgs/desktops/plasma-5/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index d80f51831fd..a199a4a959d 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 ''; |