JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python-gyp: Fix no-xcode.patch for Darwin.

Browse Source 
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>
This commit is contained in:
aszlig 2013-09-27 15:50:08 +02:00
parent cb68dc8281
commit ae47ba445c
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/gyp/no-xcode.patch
View File

@ -56,11 +56,11 @@ index b2aab986a427d5285d70558bf97f0a42bfe1556e..20592c73fae660009aac621097cf3c4f
l = '-l' + m.group(1) l = '-l' + m.group(1)
else: else:
l = library l = library
- return l.replace('$(SDKROOT)', self._SdkPath()) - return l.replace('$(SDKROOT)', self._SdkPath(config_name))
+ if self._SdkPath(): + if self._SdkPath():
+ return l.replace('$(SDKROOT)', self._SdkPath()) + return l.replace('$(SDKROOT)', self._SdkPath(config_name))
+ else: + else:
+ return l + return l
def AdjustLibraries(self, libraries): def AdjustLibraries(self, libraries, config_name=None):
"""Transforms entries like 'Cocoa.framework' in libraries into entries like """Transforms entries like 'Cocoa.framework' in libraries into entries like