mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-29 09:04:17 +00:00
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
|
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
|
||
|
|
--- node-v12.18.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2020-09-15 09:08:46.000000000 +0200
|
||
|
|
+++ 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
|
||
|
|
@@ -436,7 +436,14 @@
|
||
|
|
# Since the CLT has no SDK paths anyway, returning None is the
|
||
|
|
# most sensible route and should still do the right thing.
|
||
|
|
try:
|
||
|
|
- return GetStdoutQuiet(['xcodebuild', '-version', '-sdk', sdk, infoitem])
|
||
|
|
+ # Return fake data that xcodebuild would normally return
|
||
|
|
+
|
||
|
|
+ xcodedata = {
|
||
|
|
+ "Path": "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk",
|
||
|
|
+ "ProductBuildVersion": "19A547",
|
||
|
|
+ "ProductVersion": "10.15"
|
||
|
|
+ }
|
||
|
|
+ return xcodedata[infoitem]
|
||
|
|
except GypError:
|
||
|
|
pass
|
||
|
|
|
||
|
|
@@ -1271,7 +1278,7 @@
|
||
|
|
version = ""
|
||
|
|
build = ""
|
||
|
|
try:
|
||
|
|
- version_list = GetStdoutQuiet(['xcodebuild', '-version']).splitlines()
|
||
|
|
+ version_list = []
|
||
|
|
# 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
|