diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-08-15 17:35:56 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-08-15 17:35:56 -0500 |
commit | b421a7d0a60ca52b47aa25f990c195936da4de2b (patch) | |
tree | ec0d4b685783afb1cd5a5f7e23c944280bf232d5 /pkgs/development/web/nodejs/nodejs.nix | |
parent | d4b453d2c165ce64c36cff45095f5d57d8a925b8 (diff) |
nodejs: remove ‘no-xcode’ patches
now provided by xcbuild
Diffstat (limited to 'pkgs/development/web/nodejs/nodejs.nix')
-rw-r--r-- | pkgs/development/web/nodejs/nodejs.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 3f0ab5ff50672..aec2778fd781d 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -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 = '' |