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

darwin purity: nodejs

Browse Source
This commit is contained in:
Jude Taylor 2015-06-21 00:56:26 -07:00
parent 72737118fd
commit 6f3729e3b3
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/web/nodejs/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser { stdenv, fetchurl, openssl, python, zlib, libuv, v8, utillinux, http-parser
, pkgconfig, runCommand, which, unstableVersion ? false , pkgconfig, runCommand, which, libtool, unstableVersion ? false
}: }:
# nodejs 0.12 can't be built on armv5tel. Armv6 with FPU, minimum I think. # nodejs 0.12 can't be built on armv5tel. Armv6 with FPU, minimum I think.
@ -7,11 +7,6 @@
assert stdenv.system != "armv5tel-linux"; assert stdenv.system != "armv5tel-linux";
let let
dtrace = runCommand "dtrace-native" {} ''
mkdir -p $out/bin
ln -sv /usr/sbin/dtrace $out/bin
'';
version = "0.12.0"; version = "0.12.0";
deps = { deps = {
@ -39,7 +34,7 @@ in stdenv.mkDerivation {
sha256 = "0cifd2qhpyrbxx71a4hsagzk24qas8m5zvwcyhx69cz9yhxf404p"; sha256 = "0cifd2qhpyrbxx71a4hsagzk24qas8m5zvwcyhx69cz9yhxf404p";
}; };
configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];
prePatch = '' prePatch = ''
sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure
@ -51,11 +46,17 @@ 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})
'' else null; '' else null;
preBuild = if stdenv.isDarwin then ''
patchShebangs .
'' else null;
buildInputs = [ python which ] buildInputs = [ python which ]
++ (optional stdenv.isLinux utillinux) ++ (optional stdenv.isLinux utillinux)
++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ]; ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ];
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
enableParallelBuilding = true;
passthru.interpreterName = "nodejs"; passthru.interpreterName = "nodejs";
meta = { meta = {

5
pkgs/top-level/all-packages.nix
View File

@ -1952,7 +1952,10 @@ let
ninka = callPackage ../development/tools/misc/ninka { }; ninka = callPackage ../development/tools/misc/ninka { };
nodejs-0_12 = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; }; nodejs-0_12 = callPackage ../development/web/nodejs {
libuv = libuvVersions.v1_2_0;
libtool = darwin.cctools;
};
nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; }; nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; };
nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { }; nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { };