Skip to content

Commit

Permalink
Merge branch 'chore/ddw-1213-update-electron' into chore/ddw-1211-upd…
Browse files Browse the repository at this point in the history
…ate-trezor-connect-to-v9.0.8
  • Loading branch information
michalrus committed May 30, 2023
2 parents edcdb96 + 868f87b commit 73e7217
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion nix/new-common.nix
Expand Up @@ -30,7 +30,9 @@ rec {
# patches = pkgs.lib.optional pkgs.stdenv.isDarwin (njPath + "/bypass-xcodebuild.diff");
# };

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

0 comments on commit 73e7217

Please sign in to comment.