Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

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

(cherry picked from commit 634cbfa8f2796ad9ddf151ab639e6ca68b80aaa1)

+15 -2
+13
pkgs/development/web/nodejs/no-xcodebuild.patch
···
··· 1 + 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 2 + --- node-v8.9.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2018-01-03 03:34:44.000000000 +0100 3 + +++ 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 4 + @@ -1251,7 +1251,8 @@ 5 + if XCODE_VERSION_CACHE: 6 + return XCODE_VERSION_CACHE 7 + try: 8 + - version_list = GetStdout(['xcodebuild', '-version']).splitlines() 9 + + #version_list = GetStdout(['xcodebuild', '-version']).splitlines() 10 + + version_list = ['Xcode 9.2', 'Build version 9C40b'] 11 + # In some circumstances xcodebuild exits 0 but doesn't return 12 + # the right results; for example, a user on 10.7 or 10.8 with 13 + # a bogus path set via xcode-select
+1 -1
pkgs/development/web/nodejs/v6.nix
··· 7 inherit enableNpm; 8 version = "6.13.0"; 9 sha256 = "012dpfqxsrmd3xc4dmq0mik1kab4czf56s8wm2jvm7xjqvi6y5mp"; 10 - patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; 11 }
··· 7 inherit enableNpm; 8 version = "6.13.0"; 9 sha256 = "012dpfqxsrmd3xc4dmq0mik1kab4czf56s8wm2jvm7xjqvi6y5mp"; 10 + patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./no-xcodebuild.patch ]; 11 }
+1 -1
pkgs/development/web/nodejs/v8.nix
··· 7 inherit enableNpm; 8 version = "8.9.4"; 9 sha256 = "0vy8rlg58kg75j4sw3xadmbrwxfa56iaykmjl18g9a8wkjfdxp3c"; 10 - patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; 11 }
··· 7 inherit enableNpm; 8 version = "8.9.4"; 9 sha256 = "0vy8rlg58kg75j4sw3xadmbrwxfa56iaykmjl18g9a8wkjfdxp3c"; 10 + patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ]; 11 }