nodejs: remove ‘no-xcode’ patches
now provided by xcbuild
This commit is contained in:
@@ -3,19 +3,17 @@
|
||||
# Updater dependencies
|
||||
, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix
|
||||
, gnupg
|
||||
, darwin ? null
|
||||
, darwin, xcbuild
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
{ enableNpm ? true, version, sha256, patches } @args:
|
||||
{ enableNpm ? true, version, sha256, patches ? [] } @args:
|
||||
|
||||
let
|
||||
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
|
||||
|
||||
|
||||
|
||||
baseName = if enableNpm then "nodejs" else "nodejs-slim";
|
||||
|
||||
sharedLibDeps = { inherit openssl zlib libuv; } // (optionalAttrs (!stdenv.isDarwin) { inherit http-parser; });
|
||||
@@ -48,9 +46,10 @@ in
|
||||
};
|
||||
|
||||
buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ]
|
||||
++ [ python2 which zlib libuv openssl ]
|
||||
++ optionals stdenv.isLinux [ utillinux http-parser ]
|
||||
++ optionals stdenv.isDarwin [ pkgconfig darwin.cctools ];
|
||||
++ [ python2 zlib libuv openssl http-parser ];
|
||||
|
||||
nativeBuildInputs = [ which utillinux ]
|
||||
++ optionals stdenv.isDarwin [ pkgconfig xcbuild ];
|
||||
|
||||
configureFlags = sharedConfigureFlags ++ [ "--without-dtrace" ] ++ extraConfigFlags;
|
||||
|
||||
@@ -73,7 +72,6 @@ in
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs .
|
||||
sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
Reference in New Issue
Block a user