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

nodejs: patch bundled node-gyp module to not invoke xcodebuild on macOS causing modules with native dependencies to fail

This commit is contained in:
Sander van der Burg 2018-03-12 12:16:17 +01:00
parent 9881934b57
commit 634cbfa8f2
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/web/nodejs/no-xcodebuild.patch Normal file
View File

@ -0,0 +1,13 @@
diff -Naur node-v8.9.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py node-v8.9.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
--- node-v8.9.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2018-01-03 03:34:44.000000000 +0100
+++ node-v8.9.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2018-03-12 11:15:37.972537585 +0100
@@ -1251,7 +1251,8 @@
if XCODE_VERSION_CACHE:
return XCODE_VERSION_CACHE
try:
- version_list = GetStdout(['xcodebuild', '-version']).splitlines()
+ #version_list = GetStdout(['xcodebuild', '-version']).splitlines()
+ version_list = ['Xcode 9.2', 'Build version 9C40b']
# In some circumstances xcodebuild exits 0 but doesn't return
# the right results; for example, a user on 10.7 or 10.8 with
# a bogus path set via xcode-select

2
pkgs/development/web/nodejs/v6.nix
View File

@ -7,5 +7,5 @@ in
inherit enableNpm; inherit enableNpm;
version = "6.13.0"; version = "6.13.0";
sha256 = "012dpfqxsrmd3xc4dmq0mik1kab4czf56s8wm2jvm7xjqvi6y5mp"; sha256 = "012dpfqxsrmd3xc4dmq0mik1kab4czf56s8wm2jvm7xjqvi6y5mp";
patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./no-xcodebuild.patch ];
} }

2
pkgs/development/web/nodejs/v8.nix
View File

@ -7,5 +7,5 @@ in
inherit enableNpm; inherit enableNpm;
version = "8.9.4"; version = "8.9.4";
sha256 = "0vy8rlg58kg75j4sw3xadmbrwxfa56iaykmjl18g9a8wkjfdxp3c"; sha256 = "0vy8rlg58kg75j4sw3xadmbrwxfa56iaykmjl18g9a8wkjfdxp3c";
patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ];
} }