diff options
Diffstat (limited to 'pkgs/development/web')
-rw-r--r-- | pkgs/development/web/nodejs/nodejs.nix | 4 | ||||
-rw-r--r-- | pkgs/development/web/nodejs/v0_10.nix | 4 | ||||
-rw-r--r-- | pkgs/development/web/nodejs/v4.nix | 2 | ||||
-rw-r--r-- | pkgs/development/web/nodejs/v5.nix | 12 | ||||
-rw-r--r-- | pkgs/development/web/nodejs/v6.nix | 2 |
5 files changed, 18 insertions, 6 deletions
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 6cf73fd22b64..7c92df30311f 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -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 , version , sha256 ? null @@ -48,7 +48,7 @@ in stdenv.mkDerivation { patches = patches ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; buildInputs = extraBuildInputs - ++ [ python which zlib libuv openssl ] + ++ [ python2 which zlib libuv openssl ] ++ optionals stdenv.isLinux [ utillinux http-parser ] ++ optionals stdenv.isDarwin [ pkgconfig libtool ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix index 9845aa3bf8c8..cdb73e19232a 100644 --- a/pkgs/development/web/nodejs/v0_10.nix +++ b/pkgs/development/web/nodejs/v0_10.nix @@ -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 # apple frameworks @@ -50,7 +50,7 @@ in stdenv.mkDerivation { (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch}) ''; - buildInputs = [ python which ] + buildInputs = [ python2 which ] ++ (optional stdenv.isLinux utillinux) ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool CoreServices ApplicationServices Foundation ]; propagatedBuildInputs = optionals stdenv.isDarwin [ Carbon ]; diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix index 04605c4dea3f..f0a505a683a8 100644 --- a/pkgs/development/web/nodejs/v4.nix +++ b/pkgs/development/web/nodejs/v4.nix @@ -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 , callPackage }@args: diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix new file mode 100644 index 000000000000..7cd406abd2cd --- /dev/null +++ b/pkgs/development/web/nodejs/v5.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser +, pkgconfig, runCommand, which, libtool +, callPackage +}@args: + +import ./nodejs.nix (args // rec { + version = "5.12.0"; + src = fetchurl { + url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; + sha256 = "4f926373f11f2a25156eee1804ec012eb912c42e5d34fc2909889da22efdadfe"; + }; +}) diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index ac54f0f8d492..a2213546ec4b 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -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 , callPackage , darwin ? null |