Skip to content

Commit 868f87b

Browse files
committed
[DDW-1213] Tweak nodejs-18_x only on Darwin
1 parent 9be2ee2 commit 868f87b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

nix/new-common.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ rec {
3030
# patches = pkgs.lib.optional pkgs.stdenv.isDarwin (njPath + "/bypass-xcodebuild.diff");
3131
# };
3232

33-
nodejs = pkgs.nodejs-18_x.overrideAttrs (drv: {
33+
nodejs = let
34+
base = pkgs.nodejs-18_x;
35+
in if !(pkgs.lib.hasInfix "-darwin" targetSystem) then base else base.overrideAttrs (drv: {
3436
# XXX: we don’t want `bypass-xcodebuild.diff` or `bypass-darwin-xcrun-node16.patch`, rather we supply
3537
# the pure `xcbuild` – without that, `blake2` doesn’t build,
3638
# cf. <https://github.com/NixOS/nixpkgs/blob/29ae6a1f3d7a8886b3772df4dc42a13817875c7d/pkgs/development/web/nodejs/bypass-xcodebuild.diff>

0 commit comments

Comments
 (0)