BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Choosing a different nodejs for armv5tel.

Browse source 
nodejs 0.12 doesn't build in armv5 or without fpu, it seems.
I tested this change on armv5tel, branch staging.
This commit is contained in:
Lluís Batlle i Rossell 2015-05-03 18:02:55 +02:00
parent 2352fce776
commit 9be8b790f8
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/web/nodejs/default.nix
View file

@ -2,6 +2,10 @@
, pkgconfig, runCommand, which, unstableVersion ? false
}:
# nodejs 0.12 can't be built on armv5tel. Armv6 with FPU, minimum I think.
# Related post: http://zo0ok.com/techfindings/archives/1820
assert stdenv.system != "armv5tel-linux";
let
dtrace = runCommand "dtrace-native" {} ''
mkdir -p $out/bin

14
pkgs/top-level/all-packages.nix
View file

@ -1866,15 +1866,23 @@ let
ninka = callPackage ../development/tools/misc/ninka { };
nodejs = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; };
nodejs-0_12 = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; };
nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; };
nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { };
nodePackages_0_12 = callPackage ./node-packages.nix { self = nodePackages_0_12; };
nodejs = if stdenv.system == "armv5tel-linux" then
nodejs-0_10
else
nodejs-0_12;
nodePackages_0_12 = callPackage ./node-packages.nix { self = nodePackages_0_12; nodejs = nodejs-0_10; };
nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; };
nodePackages = nodePackages_0_12;
nodePackages = if stdenv.system == "armv5tel-linux" then
nodePackages-0_10
else
nodePackages-0_12;
iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; };