gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

writers: fix aarch64-darwin workaround if content is a string

Browse Source 
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.
This commit is contained in:
sternenseemann
2023-03-29 03:29:13 +02:00
parent f41b2e5230
commit 192d03bee4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/writers/default.nix
+2 -2
View File
@@ -71,12 +71,12 @@ let
let let
name = last (builtins.split "/" nameOrPath); name = last (builtins.split "/" nameOrPath);
in in
pkgs.runCommand name (if (types.str.check content) then { pkgs.runCommand name ((if (types.str.check content) then {
inherit content; inherit content;
passAsFile = [ "content" ]; passAsFile = [ "content" ];
} else { } else {
contentPath = content; 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 # post-link-hook expects codesign_allocate to be in PATH
# https://github.com/NixOS/nixpkgs/issues/154203 # https://github.com/NixOS/nixpkgs/issues/154203
# https://github.com/NixOS/nixpkgs/issues/148189 # https://github.com/NixOS/nixpkgs/issues/148189