nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

nodejs: apply patch that allows packages with native dependencies to compile again on darwin by bypassing xcodebuild

Browse Source
This commit is contained in:
Sander van der Burg
2020-12-04 00:43:25 +01:00
parent ba06414bd7
commit 8f7f67fa2c
4 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/web/nodejs/bypass-xcodebuild.diff Normal file
View File

@@ -0,0 +1,28 @@
diff -Naur node-v12.18.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py node-v12.18.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
--- node-v12.18.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2020-09-15 09:08:46.000000000 +0200
+++ node-v12.18.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2020-12-03 16:55:43.781860687 +0100
@@ -436,7 +436,14 @@
# Since the CLT has no SDK paths anyway, returning None is the
# most sensible route and should still do the right thing.
try:
- return GetStdoutQuiet(['xcodebuild', '-version', '-sdk', sdk, infoitem])
+ # Return fake data that xcodebuild would normally return
+
+ xcodedata = {
+ "Path": "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk",
+ "ProductBuildVersion": "19A547",
+ "ProductVersion": "10.15"
+ }
+ return xcodedata[infoitem]
except GypError:
pass
@@ -1271,7 +1278,7 @@
version = ""
build = ""
try:
- version_list = GetStdoutQuiet(['xcodebuild', '-version']).splitlines()
+ version_list = []
# In some circumstances xcodebuild exits 0 but doesn't return
# the right results; for example, a user on 10.7 or 10.8 with
# a bogus path set via xcode-select

5
pkgs/development/web/nodejs/v10.nix
View File

@@ -1,7 +1,7 @@
{ callPackage, openssl, icu, python2, enableNpm ? true }:
{ callPackage, openssl, icu, python2, stdenv, enableNpm ? true }:
let
buildNodejs = callPackage ./nodejs.nix {
buildNodejs = callPackage ./nodejs.nix {
inherit openssl icu;
python = python2;
};
@@ -10,4 +10,5 @@ in
inherit enableNpm;
version = "10.22.1";
sha256 = "0pr569qiabr4m7k38s7rwi3iyzrc5jmx19z2z0k7n4xfvhjlfzzl";
patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}

5
pkgs/development/web/nodejs/v12.nix
View File

@@ -1,7 +1,7 @@
{ callPackage, openssl, icu, python2, enableNpm ? true }:
{ callPackage, openssl, icu, python2, stdenv, enableNpm ? true }:
let
buildNodejs = callPackage ./nodejs.nix {
buildNodejs = callPackage ./nodejs.nix {
inherit openssl icu;
python = python2;
};
@@ -10,4 +10,5 @@ in
inherit enableNpm;
version = "12.18.4";
sha256 = "02gncjrrjqdwf9ydmg96yn9ldsw539q9w88cknax1djkisqkrw15";
patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}

3
pkgs/development/web/nodejs/v14.nix
View File

@@ -1,4 +1,4 @@
{ callPackage, openssl, python3, enableNpm ? true }:
{ callPackage, openssl, python3, stdenv, enableNpm ? true }:
let
buildNodejs = callPackage ./nodejs.nix {
@@ -10,4 +10,5 @@ in
inherit enableNpm;
version = "14.9.0";
sha256 = "1xkfivr0qci50ksg66szyasdlbiwh2j7ia4n6qc5csih2nvzcbh1";
patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}