diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/gyp')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/gyp/default.nix | 11 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/gyp/no-xcode.patch | 23 |
2 files changed, 21 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/gyp/default.nix b/nixpkgs/pkgs/development/python-modules/gyp/default.nix index b9ad6ccec24..c951c97b20f 100644 --- a/nixpkgs/pkgs/development/python-modules/gyp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gyp/default.nix @@ -6,19 +6,14 @@ buildPythonPackage { pname = "gyp"; - version = "2015-06-11"; - disabled = isPy3k; + version = "2020-05-12"; src = fetchFromGitiles { url = "https://chromium.googlesource.com/external/gyp"; - rev = "fdc7b812f99e48c00e9a487bd56751bbeae07043"; - sha256 = "1imgxsl4mr1662vsj2mlnpvvrbz71yk00w8p85vi5bkgmc6awgiz"; + rev = "caa60026e223fc501e8b337fd5086ece4028b1c6"; + 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 d202b722474..0e46865846a 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 = {} |