Skip to content

Commit 339f145

Browse files
authored
nix: drop the recent patch on darwin, fixing build (NixOS#469207)
2 parents a5d646b + 1dfe863 commit 339f145

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

pkgs/tools/package-management/nix/default.nix

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,14 @@ lib.makeExtensible (
178178
hash = "sha256-NLGXPLjENLeKVOg3OZgHXZ+1x6sPIKq9FHH8pxbCrDI=";
179179
};
180180
}).appendPatches
181-
[
182-
(fetchpatch2 {
181+
(
182+
# issues on darwin: https://github.com/NixOS/nixpkgs/pull/468208#issuecomment-3626314109
183+
lib.optional stdenv.isLinux (fetchpatch2 {
183184
name = "nix-2.31-14240-sri-error-message.patch";
184185
url = "https://github.com/NixOS/nix/commit/56751b1cd2c4700c71c545f2246adf602c97fdf5.patch";
185186
hash = "sha256-CerSBAI+H2RqPp9jsCP0QIM2rZYx3yBZHVVUAztgc18=";
186187
})
187-
];
188+
);
188189

189190
nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything;
190191

0 commit comments

Comments
 (0)