commit d4081c2f97fbdde94b3e8db27b089cedbcde9272 · pyrox.dev/nixpkgs

+24

pkgs/development/web/nodejs/default-arch.patch

···

       1
       1
       +
       diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py

     

       2
       2
       +
       --- a/tools/gyp/pylib/gyp/xcode_emulation.py	2014-01-23 06:05:51.000000000 +0100

     

       3
       3
       +
       +++ b/tools/gyp/pylib/gyp/xcode_emulation.py	2014-02-04 17:49:48.000000000 +0100

     

       4
       4
       +
       @@ -1018,12 +1033,16 @@

     

       5
       5
       +
            # Since the value returned by this function is only used when ARCHS is not

     

       6
       6
       +
            # set, then on iOS we return "i386", as the default xcode project generator

     

       7
       7
       +
            # does not set ARCHS if it is not set in the .gyp file.

     

       8
       8
       +
       -    if self.isIOS:

     

       9
       9
       +
       +    

     

       10
       10
       +
       +    try:

     

       11
       11
       +
       +      if self.isIOS:

     

       12
       12
       +
       +        return 'i386'

     

       13
       13
       +
       +      version, build = self._XcodeVersion()

     

       14
       14
       +
       +      if version >= '0500':

     

       15
       15
       +
       +        return 'x86_64'

     

       16
       16
       +
              return 'i386'

     

       17
       17
       +
       -    version, build = self._XcodeVersion()

     

       18
       18
       +
       -    if version >= '0500':

     

       19
       19
       +
       +    except:

     

       20
       20
       +
              return 'x86_64'

     

       21
       21
       +
       -    return 'i386'

     

       22
       22
       +
        

     

       23
       23
       +
        class MacPrefixHeader(object):

     

       24
       24
       +
          """A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature.

+4 -3

pkgs/development/web/nodejs/default.nix

···

       38
       38
        
         dontDisableStatic = true;

     

       39
       39
        
         prePatch = ''

     

       40
       40
        
           patchShebangs .

     

       41
       41
       +
           sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py

     

       41
       42
        
         '';

     

       42
       43
        
       

     

       43
       43
       -
         patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode.patch;

     

       44
       44
       +
         patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./pkg-libpath.patch ];

     

       44
       45
        
       

     

       45
       45
       -
         buildInputs = [ python which http-parser zlib libuv openssl python ]

     

       46
       46
       -
           ++ (optional stdenv.isLinux utillinux)

     

       46
       46
       +
         buildInputs = [ python which zlib libuv openssl python ]

     

       47
       47
       +
           ++ optionals stdenv.isLinux [ utillinux http-parser ]

     

       47
       48
        
           ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ];

     

       48
       49
        
         setupHook = ./setup-hook.sh;

     

       49
       50

-21

pkgs/development/web/nodejs/no-xcode.patch

···

       70
       70
        
        

     

       71
       71
        
          def AdjustLibraries(self, libraries, config_name=None):

     

       72
       72
        
            """Transforms entries like 'Cocoa.framework' in libraries into entries like

     

       73
       73
       -
       @@ -1018,12 +1033,16 @@

     

       74
       74
       -
            # Since the value returned by this function is only used when ARCHS is not

     

       75
       75
       -
            # set, then on iOS we return "i386", as the default xcode project generator

     

       76
       76
       -
            # does not set ARCHS if it is not set in the .gyp file.

     

       77
       77
       -
       -    if self.isIOS:

     

       78
       78
       -
       +    

     

       79
       79
       -
       +    try:

     

       80
       80
       -
       +      if self.isIOS:

     

       81
       81
       -
       +        return 'i386'

     

       82
       82
       -
       +      version, build = self._XcodeVersion()

     

       83
       83
       -
       +      if version >= '0500':

     

       84
       84
       -
       +        return 'x86_64'

     

       85
       85
       -
              return 'i386'

     

       86
       86
       -
       -    version, build = self._XcodeVersion()

     

       87
       87
       -
       -    if version >= '0500':

     

       88
       88
       -
       +    except:

     

       89
       89
       -
              return 'x86_64'

     

       90
       90
       -
       -    return 'i386'

     

       91
       91
       -
        

     

       92
       92
       -
        class MacPrefixHeader(object):

     

       93
       93
       -
          """A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature.

+13

pkgs/development/web/nodejs/pkg-libpath.patch

···

       1
       1
       +
       diff --git a/configure b/configure

     

       2
       2
       +
       index d199975..66d903b 100755

     

       3
       3
       +
       --- a/configure

     

       4
       4
       +
       +++ b/configure

     

       5
       5
       +
       @@ -734,7 +734,7 @@ def configure_library(lib, output):

     

       6
       6
       +
            # libpath needs to be provided ahead libraries

     

       7
       7
       +
            if pkg_libpath:

     

       8
       8
       +
              output['libraries'] += (

     

       9
       9
       +
       -          filter(None, map(str.strip, pkg_cflags.split('-L'))))

     

       10
       10
       +
       +          pkg_libpath.split())

     

       11
       11
       +
        

     

       12
       12
       +
            default_libs = getattr(options, shared_lib + '_libname')

     

       13
       13
       +
            default_libs = map('-l{0}'.format, default_libs.split(','))

+1 -1

pkgs/development/web/nodejs/v0_10.nix

···

       42
       42
        
           patchShebangs .

     

       43
       43
        
         '';

     

       44
       44
        
       

     

       45
       45
       -
         patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode.patch;

     

       45
       45
       +
         patches = stdenv.lib.optionals stdenv.isDarwin [ ./default-arch.patch ./no-xcode.patch ];

     

       46
       46
        
       

     

       47
       47
        
         postPatch = stdenv.lib.optionalString stdenv.isDarwin ''

     

       48
       48
        
           (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch})