diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-03-29 03:27:19 +0200 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2023-03-29 03:29:13 +0200 |
| commit | 192d03bee462f0eca2112c4f136fb1aac084f165 (patch) | |
| tree | c9f0d6c23e72df379ba58b44f08b35b924363005 /pkgs/build-support/writers | |
| parent | f41b2e5230e320c98379267574dafaf809ed8bbe (diff) | |
writers: fix aarch64-darwin workaround if content is a string
When authoring #220966, I missed that the `//` would take effect solely in the else branch, fixing hledger-check-fancyassertions, but not tests.writers.bin.haskell.
Diffstat (limited to 'pkgs/build-support/writers')
| -rw-r--r-- | pkgs/build-support/writers/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index ca0184beeb0c0..2c26f350fbd77 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -71,12 +71,12 @@ let let name = last (builtins.split "/" nameOrPath); in - pkgs.runCommand name (if (types.str.check content) then { + pkgs.runCommand name ((if (types.str.check content) then { inherit content; passAsFile = [ "content" ]; } else { contentPath = content; - } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) { + }) // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) { # post-link-hook expects codesign_allocate to be in PATH # https://github.com/NixOS/nixpkgs/issues/154203 # https://github.com/NixOS/nixpkgs/issues/148189 |