commit d162d8e50de274431d97bcf28c70751481e2ca82 · pyrox.dev/nixpkgs

+37 -2

pkgs/development/web/nodejs/bypass-darwin-xcrun-node16.patch

···

       1
       1
        
       Avoids needing xcrun or xcodebuild in PATH for native package builds

     

       2
       2
        
       

     

       3
       3
       -
       diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py

     

       4
       4
       -
       index a75d8ee..476440d 100644

     

       3
       3
       +
       --- a/tools/gyp/pylib/gyp/xcode_emulation.py

     

       4
       4
       +
       +++ b/tools/gyp/pylib/gyp/xcode_emulation.py

     

       5
       5
       +
       @@ -522,7 +522,13 @@ class XcodeSettings:

     

       6
       6
       +
                # Since the CLT has no SDK paths anyway, returning None is the

     

       7
       7
       +
                # most sensible route and should still do the right thing.

     

       8
       8
       +
                try:

     

       9
       9
       +
       -            return GetStdoutQuiet(["xcrun", "--sdk", sdk, infoitem])

     

       10
       10
       +
       +            #return GetStdoutQuiet(["xcrun", "--sdk", sdk, infoitem])

     

       11
       11
       +
       +            return {

     

       12
       12
       +
       +                "--show-sdk-platform-path": "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform",

     

       13
       13
       +
       +                "--show-sdk-path": "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk",

     

       14
       14
       +
       +                "--show-sdk-build-version": "19A547",

     

       15
       15
       +
       +                "--show-sdk-version": "10.15"

     

       16
       16
       +
       +            }[infoitem]

     

       17
       17
       +
                except GypError:

     

       18
       18
       +
                    pass

     

       19
       19
       +
        

     

       20
       20
       +
       @@ -1499,7 +1505,8 @@ def XcodeVersion():

     

       21
       21
       +
            version = ""

     

       22
       22
       +
            build = ""

     

       23
       23
       +
            try:

     

       24
       24
       +
       -        version_list = GetStdoutQuiet(["xcodebuild", "-version"]).splitlines()

     

       25
       25
       +
       +        #version_list = GetStdoutQuiet(["xcodebuild", "-version"]).splitlines()

     

       26
       26
       +
       +        version_list = []

     

       27
       27
       +
                # In some circumstances xcodebuild exits 0 but doesn't return

     

       28
       28
       +
                # the right results; for example, a user on 10.7 or 10.8 with

     

       29
       29
       +
                # a bogus path set via xcode-select

     

       30
       30
       +
       @@ -1510,7 +1517,8 @@ def XcodeVersion():

     

       31
       31
       +
                version = version_list[0].split()[-1]  # Last word on first line

     

       32
       32
       +
                build = version_list[-1].split()[-1]  # Last word on last line

     

       33
       33
       +
            except GypError:  # Xcode not installed so look for XCode Command Line Tools

     

       34
       34
       +
       -        version = CLTVersion()  # macOS Catalina returns 11.0.0.0.1.1567737322

     

       35
       35
       +
       +        #version = CLTVersion()  # macOS Catalina returns 11.0.0.0.1.1567737322

     

       36
       36
       +
       +        version = "11.0.0.0.1.1567737322"

     

       37
       37
       +
                if not version:

     

       38
       38
       +
                    raise GypError("No Xcode or CLT version detected!")

     

       39
       39
       +
            # Be careful to convert "4.2.3" to "0423" and "11.0.0" to "1100":

     

       5
       40
        
       --- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py

     

       6
       41
        
       +++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py

     

       7
       42
        
       @@ -522,7 +522,13 @@ class XcodeSettings:

+49 -11

pkgs/development/web/nodejs/nodejs.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, openssl, python, zlib, libuv, http-parser, icu, bash

     

       2
       2
       -
       , pkg-config, which, buildPackages

     

       2
       2
       +
       , ninja, pkgconf, unixtools, runCommand, buildPackages

     

       3
       3
        
       , testers

     

       4
       4
        
       # for `.pkgs` attribute

     

       5
       5
        
       , callPackage

     

       6
       6
        
       # Updater dependencies

     

       7
       7
        
       , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell

     

       8
       8
        
       , gnupg

     

       9
       9
       -
       , darwin, xcbuild

     

       9
       9
       +
       , darwin

     

       10
       10
        
       , installShellFiles

     

       11
       11
        
       }:

     

       12
       12
        
       

     
···

       104
       104
        
             (name: "${lib.getDev sharedLibDeps.${name}}/include/*")

     

       105
       105
        
             (builtins.attrNames sharedLibDeps);

     

       106
       106
        
       

     

       107
       107
       +
         # Currently stdenv sets CC/LD/AR/etc environment variables to program names

     

       108
       108
       +
         # instead of absolute paths. If we add cctools to nativeBuildInputs, that

     

       109
       109
       +
         # would shadow stdenv’s bintools and potentially break other parts of the

     

       110
       110
       +
         # build. The correct behavior is to use absolute paths, and there is a PR for

     

       111
       111
       +
         # that, see https://github.com/NixOS/nixpkgs/pull/314920. As a temporary

     

       112
       112
       +
         # workaround, we use only a single program we need (and that is not part of

     

       113
       113
       +
         # the stdenv).

     

       114
       114
       +
         darwin-cctools-only-libtool =

     

       115
       115
       +
           # Would be nice to have onlyExe builder similar to onlyBin…

     

       116
       116
       +
           runCommand "darwin-cctools-only-libtool" { cctools = lib.getBin buildPackages.cctools; } ''

     

       117
       117
       +
             mkdir -p "$out/bin"

     

       118
       118
       +
             ln -s "$cctools/bin/libtool" "$out/bin/libtool"

     

       119
       119
       +
           '';

     

       120
       120
       +
       

     

       107
       121
        
         package = stdenv.mkDerivation (finalAttrs:

     

       108
       122
        
         let

     

       109
       123
        
           /** the final package fixed point, after potential overrides */

     
···

       128
       142
        
           # NB: technically, we do not need bash in build inputs since all scripts are

     

       129
       143
        
           # wrappers over the corresponding JS scripts. There are some packages though

     

       130
       144
        
           # that use bash wrappers, e.g. polaris-web.

     

       131
       131
       -
           buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]

     

       145
       145
       +
           buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ApplicationServices ]

     

       132
       146
        
             ++ [ zlib libuv openssl http-parser icu bash ];

     

       133
       147
        
       

     

       134
       134
       -
           nativeBuildInputs = [ installShellFiles pkg-config python which ]

     

       135
       135
       -
             ++ lib.optionals stdenv.isDarwin [ xcbuild ];

     

       148
       148
       +
           nativeBuildInputs =

     

       149
       149
       +
             [

     

       150
       150
       +
               installShellFiles

     

       151
       151
       +
               ninja

     

       152
       152
       +
               pkgconf

     

       153
       153
       +
               python

     

       154
       154
       +
             ]

     

       155
       155
       +
             ++ lib.optionals stdenv.buildPlatform.isDarwin [

     

       156
       156
       +
               # gyp checks `sysctl -n hw.memsize` if `sys.platform == "darwin"`.

     

       157
       157
       +
               unixtools.sysctl

     

       158
       158
       +
             ]

     

       159
       159
       +
             ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       160
       160
       +
               # For gyp-mac-tool if `flavor == "mac"`.

     

       161
       161
       +
               darwin-cctools-only-libtool

     

       162
       162
       +
             ];

     

       163
       163
       +
       

     

       164
       164
       +
           # We currently rely on Makefile and stdenv for build phases, so do not let

     

       165
       165
       +
           # ninja’s setup hook to override default stdenv phases.

     

       166
       166
       +
           dontUseNinjaBuild = true;

     

       167
       167
       +
           dontUseNinjaCheck = true;

     

       168
       168
       +
           dontUseNinjaInstall = true;

     

       136
       169
        
       

     

       137
       170
        
           outputs = [ "out" "libv8" ];

     

       138
       171
        
           setOutputFlags = false;

     
···

       140
       173
        
       

     

       141
       174
        
           configureFlags =

     

       142
       175
        
             [

     

       176
       176
       +
               "--ninja"

     

       177
       177
       +
               "--with-intl=system-icu"

     

       178
       178
       +
               "--openssl-use-def-ca-store"

     

       143
       179
        
               "--no-cross-compiling"

     

       144
       180
        
               "--dest-os=${destOS}"

     

       145
       181
        
               "--dest-cpu=${destCPU}"

     
···

       167
       203
        
                 FIXME: the statement above is outdated, we have to include pkg-config

     

       168
       204
        
                 in build inputs for system-icu.

     

       169
       205
        
               */

     

       170
       170
       -
             ]) (builtins.attrNames sharedLibDeps)

     

       171
       171
       -
             ++ [

     

       172
       172
       -
               "--with-intl=system-icu"

     

       173
       173
       -
               "--openssl-use-def-ca-store"

     

       174
       174
       -
             ];

     

       206
       206
       +
             ]) (builtins.attrNames sharedLibDeps);

     

       175
       207
        
       

     

       176
       208
        
           configurePlatforms = [ ];

     

       177
       209
        
       

     
···

       182
       214
        
           '';

     

       183
       215
        
       

     

       184
       216
        
           enableParallelBuilding = true;

     

       217
       217
       +
       

     

       218
       218
       +
           makeFlags = [

     

       219
       219
       +
             # Tell ninja to avoid ANSI sequences, otherwise we don’t see build

     

       220
       220
       +
             # progress in Nix logs.

     

       221
       221
       +
             "TERM=dumb"

     

       222
       222
       +
           ];

     

       185
       223
        
       

     

       186
       224
        
           # Don't allow enabling content addressed conversion as `nodejs`

     

       187
       225
        
           # checksums it's image before conversion happens and image loading

     
···

       299
       337
        
       

     

       300
       338
        
             # assemble a static v8 library and put it in the 'libv8' output

     

       301
       339
        
             mkdir -p $libv8/lib

     

       302
       302
       -
             pushd out/Release/obj.target

     

       340
       340
       +
             pushd out/Release/obj

     

       303
       341
        
             find . -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" | sort -u >files

     

       304
       342
        
             $AR -cqs $libv8/lib/libv8.a @files

     

       305
       343
        
             popd