Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ae0b65aacc6a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c7f415b52250
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Mar 12, 2018

  1. nodejs: patch bundled node-gyp module to not invoke xcodebuild on mac… 

    …OS causing modules with native dependencies to fail
    @svanderburg
    svanderburg committed Mar 12, 2018
    Copy the full SHA
    c7f415b View commit details
Showing with 15 additions and 1 deletion.
  1. +13 −0 pkgs/development/web/nodejs/no-xcodebuild.patch
  2. +1 −0 pkgs/development/web/nodejs/v6.nix
  3. +1 −1 pkgs/development/web/nodejs/v8.nix
13 changes: 13 additions & 0 deletions pkgs/development/web/nodejs/no-xcodebuild.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff -Naur node-v8.9.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py node-v8.9.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
--- node-v8.9.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2018-01-03 03:34:44.000000000 +0100
+++ node-v8.9.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py 2018-03-12 11:15:37.972537585 +0100
@@ -1251,7 +1251,8 @@
if XCODE_VERSION_CACHE:
return XCODE_VERSION_CACHE
try:
- version_list = GetStdout(['xcodebuild', '-version']).splitlines()
+ #version_list = GetStdout(['xcodebuild', '-version']).splitlines()
+ version_list = ['Xcode 9.2', 'Build version 9C40b']
# 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
1 change: 1 addition & 0 deletions pkgs/development/web/nodejs/v6.nix
View file
Original file line number Diff line number Diff line change
@@ -16,4 +16,5 @@ in
url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
sha256 = "1p6w7ngp95lc3ksyklp1mwyq1f02vz62r1h60g1ri00pl8pnfn0s";
};
patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./no-xcodebuild.patch ];
})
2 changes: 1 addition & 1 deletion pkgs/development/web/nodejs/v8.nix
View file
Original file line number Diff line number Diff line change
@@ -17,5 +17,5 @@ in
sha256 = "0vy8rlg58kg75j4sw3xadmbrwxfa56iaykmjl18g9a8wkjfdxp3c";
};

patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ];
})