diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-08-02 21:01:12 -0500 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-09-29 11:53:01 +0000 |
| commit | cb21738e966b73eb85529ad4bf9ceeecfa81d7c2 (patch) | |
| tree | bccdc37565477f88597c50a510f66c275c4e5623 /nixpkgs | |
| parent | 7382e2d536aa212567f358e4e2179b74d2a8b283 (diff) | |
| download | nixlib-cb21738e966b73eb85529ad4bf9ceeecfa81d7c2.tar nixlib-cb21738e966b73eb85529ad4bf9ceeecfa81d7c2.tar.gz nixlib-cb21738e966b73eb85529ad4bf9ceeecfa81d7c2.tar.bz2 nixlib-cb21738e966b73eb85529ad4bf9ceeecfa81d7c2.tar.lz nixlib-cb21738e966b73eb85529ad4bf9ceeecfa81d7c2.tar.xz nixlib-cb21738e966b73eb85529ad4bf9ceeecfa81d7c2.tar.zst nixlib-cb21738e966b73eb85529ad4bf9ceeecfa81d7c2.zip | |
gyp: update no-xcode.patch
(cherry picked from commit dab2ed10e1c18eb8c4f0a8857af7bd874a3b9a81)
Diffstat (limited to 'nixpkgs')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/gyp/default.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/gyp/no-xcode.patch | 23 |
2 files changed, 18 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/gyp/default.nix b/nixpkgs/pkgs/development/python-modules/gyp/default.nix index 8bb20fafe76e..c951c97b20f4 100644 --- a/nixpkgs/pkgs/development/python-modules/gyp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gyp/default.nix @@ -14,10 +14,6 @@ buildPythonPackage { sha256 = "0r9phq5yrmj968vdvy9vivli35wn1j9a6iwshp69wl7q4p0x8q2b"; }; - prePatch = stdenv.lib.optionals stdenv.isDarwin '' - sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' pylib/gyp/xcode_emulation.py - ''; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-darwin-cflags.patch ./no-xcode.patch diff --git a/nixpkgs/pkgs/development/python-modules/gyp/no-xcode.patch b/nixpkgs/pkgs/development/python-modules/gyp/no-xcode.patch index d202b7224744..0e46865846a8 100644 --- a/nixpkgs/pkgs/development/python-modules/gyp/no-xcode.patch +++ b/nixpkgs/pkgs/development/python-modules/gyp/no-xcode.patch @@ -1,12 +1,25 @@ ---- a/pylib/gyp/xcode_emulation.py -+++ b/pylib/gyp/xcode_emulation.py -@@ -1470,7 +1470,8 @@ +--- gyp-old/pylib/gyp/xcode_emulation.py 1980-01-02 00:00:00.000000000 -0600 ++++ gyp/pylib/gyp/xcode_emulation.py 2020-08-02 20:24:24.871322520 -0500 +@@ -1407,10 +1407,10 @@ + raise GypError("xcodebuild returned unexpected results") + except: + version = CLTVersion() +- if version: ++ if version and re.match(r'(\d\.\d\.?\d*)', version): + version = re.match(r'(\d\.\d\.?\d*)', version).groups()[0] + else: +- raise GypError("No Xcode or CLT version detected!") ++ version = '7.0.0' + # The CLT has no build information, so we return an empty string. + version_list = [version, ''] + version = version_list[0] +@@ -1667,7 +1667,8 @@ sdk_root = xcode_settings._SdkRoot(configuration) if not sdk_root: sdk_root = xcode_settings._XcodeSdkPath('') - env['SDKROOT'] = sdk_root -+ if sdk_root: -+ env['SDKROOT'] = sdk_root ++ if not sdk_root: ++ env['SDKROOT'] = '' if not additional_settings: additional_settings = {} |