diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 20:53:27 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 20:53:27 +0200 |
commit | 14aa936ec52cc01c0b67470bf83b7b0b9aad6aef (patch) | |
tree | b8b511e368df0c9583d41b9347673b3164a797dd /pkgs/development/web/nodejs/nodejs.nix | |
parent | 6cb6ea1fed65bef4f2e9f02241a3e828c57fe57d (diff) | |
parent | 4ff7702082bad838e70140091afe7e77a9f00eca (diff) |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/web/nodejs/nodejs.nix')
-rw-r--r-- | pkgs/development/web/nodejs/nodejs.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index eb9e32328100a..b2ee7528814f6 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -3,20 +3,18 @@ # Updater dependencies , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix , gnupg -, darwin ? null +, darwin, xcbuild , procps }: 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; }); @@ -49,9 +47,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; |