Merge pull request #307098 from r-ryantm/auto-update/cilium-cli
[NixPkgs.git] / pkgs / development / web / nodejs / bypass-xcodebuild.diff
blob5c900dd2143f40765137626a2bc4e196c64585fe
1 diff -Naur node-v12.18.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py node-v12.18.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
2 --- node-v12.18.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2020-09-15 09:08:46.000000000 +0200
3 +++ node-v12.18.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2020-12-03 16:55:43.781860687 +0100
4 @@ -436,7 +436,14 @@
5 # Since the CLT has no SDK paths anyway, returning None is the
6 # most sensible route and should still do the right thing.
7 try:
8 - return GetStdoutQuiet(['xcodebuild', '-version', '-sdk', sdk, infoitem])
9 + # Return fake data that xcodebuild would normally return
11 + xcodedata = {
12 + "Path": "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk",
13 + "ProductBuildVersion": "19A547",
14 + "ProductVersion": "10.15"
15 + }
16 + return xcodedata[infoitem]
17 except GypError:
18 pass
20 @@ -1271,7 +1278,7 @@
21 version = ""
22 build = ""
23 try:
24 - version_list = GetStdoutQuiet(['xcodebuild', '-version']).splitlines()
25 + version_list = []
26 # In some circumstances xcodebuild exits 0 but doesn't return
27 # the right results; for example, a user on 10.7 or 10.8 with
28 # a bogus path set via xcode-select