Skip to content

nodejs: add back newer bypass-xcrun patch#193759

Merged
happysalada merged 2 commits intoNixOS:stagingfrom
lilyinstarlight:fix/nodepackages-darwin-v2
Sep 30, 2022
Merged

nodejs: add back newer bypass-xcrun patch#193759
happysalada merged 2 commits intoNixOS:stagingfrom
lilyinstarlight:fix/nodepackages-darwin-v2

Conversation

@lilyinstarlight
Copy link
Member

Description of changes

See discussion in #193533

This was a Node.js patch we'd been carrying for a while but it got dropped/forgotten with the v16 update. With nodePackages now being on Node.js v18, some packages fail because bundled node-gyp is looking for Xcode and this patch was intended to fake version data to prevent that

I made a new patch file instead of reusing the Node.js v14 patch file since between v14 and v16 because the xcode_emulation.py file was refactored

I tested this with bitwarden-cli in GitHub Actions to see if it resolves the need for xcbuild in nodePackages, since I don't actually have a Mac. It seemed to work there and I assume it will work for other similarly affected packages as well

This is my first staging PR so let me know if I need to do anything else for it. Thanks!

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Sep 30, 2022
@happysalada happysalada merged commit 6882116 into NixOS:staging Sep 30, 2022
@lilyinstarlight lilyinstarlight deleted the fix/nodepackages-darwin-v2 branch September 30, 2022 23:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants