diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index dce8479d219e..ce872fbcb5ee 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, python2, zlib, libuv, utillinux, http-parser +{ stdenv, fetchurl, openssl, python, zlib, libuv, utillinux, http-parser , pkgconfig, which # Updater dependencies , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell @@ -55,7 +55,7 @@ in buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] ++ [ zlib libuv openssl http-parser icu ]; - nativeBuildInputs = [ which utillinux pkgconfig python2 ] + nativeBuildInputs = [ which utillinux pkgconfig python ] ++ optionals stdenv.isDarwin [ xcbuild ]; configureFlags = let @@ -145,5 +145,5 @@ in platforms = platforms.linux ++ platforms.darwin; }; - passthru.python = python2; # to ensure nodeEnv uses the same version + passthru.python = python; # to ensure nodeEnv uses the same version } diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 815b569a7eb4..eb39446400ca 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -1,7 +1,10 @@ -{ callPackage, openssl, enableNpm ? true }: +{ callPackage, openssl, icu, python2, enableNpm ? true }: let - buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; + buildNodejs = callPackage ./nodejs.nix { + inherit openssl icu; + python = python2; + }; in buildNodejs { inherit enableNpm; diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 3fa5216ccf82..5fe8d4317179 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -1,7 +1,10 @@ -{ callPackage, openssl, icu, enableNpm ? true }: +{ callPackage, openssl, icu, python2, enableNpm ? true }: let - buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; }; + buildNodejs = callPackage ./nodejs.nix { + inherit openssl icu; + python = python2; + }; in buildNodejs { inherit enableNpm; diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix index 8676214b50b2..0728e7fc70f0 100644 --- a/pkgs/development/web/nodejs/v13.nix +++ b/pkgs/development/web/nodejs/v13.nix @@ -1,7 +1,10 @@ -{ callPackage, openssl, icu, enableNpm ? true }: +{ callPackage, openssl, icu, python3, enableNpm ? true }: let - buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; }; + buildNodejs = callPackage ./nodejs.nix { + inherit openssl icu; + python = python3; + }; in buildNodejs { inherit enableNpm;