diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2013-09-27 15:50:08 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2013-09-27 15:52:44 +0200 |
| commit | ae47ba445c632ec4cfac54d3f28a704b2ca5f221 (patch) | |
| tree | 33fc7efeee6ef481ce535f5042e37cbe010854b9 /pkgs/development/python-modules/gyp | |
| parent | cb68dc82814b50e670d937faf4f9ccab1539837d (diff) | |
| download | nixpkgs-ae47ba445c632ec4cfac54d3f28a704b2ca5f221.tar nixpkgs-ae47ba445c632ec4cfac54d3f28a704b2ca5f221.tar.gz nixpkgs-ae47ba445c632ec4cfac54d3f28a704b2ca5f221.tar.bz2 nixpkgs-ae47ba445c632ec4cfac54d3f28a704b2ca5f221.tar.lz nixpkgs-ae47ba445c632ec4cfac54d3f28a704b2ca5f221.tar.xz nixpkgs-ae47ba445c632ec4cfac54d3f28a704b2ca5f221.tar.zst nixpkgs-ae47ba445c632ec4cfac54d3f28a704b2ca5f221.zip | |
python-gyp: Fix no-xcode.patch for Darwin.
The last hunk of the patch doesn't apply anymore and causes a build failure on Darwin systems: https://hydra.nixos.org/build/6294943 Fixed the hunk manually. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/development/python-modules/gyp')
| -rw-r--r-- | pkgs/development/python-modules/gyp/no-xcode.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/gyp/no-xcode.patch b/pkgs/development/python-modules/gyp/no-xcode.patch index 951be7b005a..eb33a2b9987 100644 --- a/pkgs/development/python-modules/gyp/no-xcode.patch +++ b/pkgs/development/python-modules/gyp/no-xcode.patch @@ -56,11 +56,11 @@ index b2aab986a427d5285d70558bf97f0a42bfe1556e..20592c73fae660009aac621097cf3c4f l = '-l' + m.group(1) else: l = library -- return l.replace('$(SDKROOT)', self._SdkPath()) +- return l.replace('$(SDKROOT)', self._SdkPath(config_name)) + if self._SdkPath(): -+ return l.replace('$(SDKROOT)', self._SdkPath()) ++ return l.replace('$(SDKROOT)', self._SdkPath(config_name)) + else: + return l - def AdjustLibraries(self, libraries): + def AdjustLibraries(self, libraries, config_name=None): """Transforms entries like 'Cocoa.framework' in libraries into entries like |