public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nodejs: use python2

Browse Source
This commit is contained in:
Frederik Rietdijk 2016-10-18 10:08:28 +02:00
parent bd8b0dffae
commit ad227648c0
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/web/nodejs/nodejs.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser { stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, libtool , pkgconfig, runCommand, which, libtool
, version , version
, sha256 ? null , sha256 ? null
@ -48,7 +48,7 @@ in stdenv.mkDerivation {
patches = patches ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; patches = patches ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
buildInputs = extraBuildInputs buildInputs = extraBuildInputs
++ [ python which zlib libuv openssl ] ++ [ python2 which zlib libuv openssl ]
++ optionals stdenv.isLinux [ utillinux http-parser ] ++ optionals stdenv.isLinux [ utillinux http-parser ]
++ optionals stdenv.isDarwin [ pkgconfig libtool ]; ++ optionals stdenv.isDarwin [ pkgconfig libtool ];
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;

4
pkgs/development/web/nodejs/v0_10.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares { stdenv, lib, fetchurl, openssl, python2, zlib, v8, utillinux, http-parser, c-ares
, pkgconfig, runCommand, which, libtool , pkgconfig, runCommand, which, libtool
# apple frameworks # apple frameworks
@ -50,7 +50,7 @@ in stdenv.mkDerivation {
(cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch}) (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch})
''; '';
buildInputs = [ python which ] buildInputs = [ python2 which ]
++ (optional stdenv.isLinux utillinux) ++ (optional stdenv.isLinux utillinux)
++ optionals stdenv.isDarwin [ pkgconfig openssl libtool CoreServices ApplicationServices Foundation ]; ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool CoreServices ApplicationServices Foundation ];
propagatedBuildInputs = optionals stdenv.isDarwin [ Carbon ]; propagatedBuildInputs = optionals stdenv.isDarwin [ Carbon ];

2
pkgs/development/web/nodejs/v4.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser { stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, libtool , pkgconfig, runCommand, which, libtool
, callPackage , callPackage
}@args: }@args:

2
pkgs/development/web/nodejs/v5.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser { stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, libtool , pkgconfig, runCommand, which, libtool
, callPackage , callPackage
}@args: }@args:

2
pkgs/development/web/nodejs/v6.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser { stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, libtool, fetchpatch , pkgconfig, runCommand, which, libtool, fetchpatch
, callPackage , callPackage
, darwin ? null , darwin ? null