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

ocaml: native code building for ARM on 3.12 and 4.00

Browse Source 
I think it already works. I'll test more throughly tomorrow.
This commit is contained in:
Lluis Batlle 2012-09-23 23:56:48 +02:00
parent be20063772
commit 839f124ba1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/ocaml/3.12.1.nix
View File

@ -2,7 +2,7 @@
let let
useX11 = !stdenv.isArm && !stdenv.isMips; useX11 = !stdenv.isArm && !stdenv.isMips;
useNativeCompilers = !stdenv.isArm && !stdenv.isMips; useNativeCompilers = !stdenv.isMips;
inherit (stdenv.lib) optionals optionalString; inherit (stdenv.lib) optionals optionalString;
in in

2
pkgs/development/compilers/ocaml/4.00.0.nix
View File

@ -2,7 +2,7 @@
let let
useX11 = !stdenv.isArm && !stdenv.isMips; useX11 = !stdenv.isArm && !stdenv.isMips;
useNativeCompilers = !stdenv.isArm && !stdenv.isMips; useNativeCompilers = !stdenv.isMips;
inherit (stdenv.lib) optionals optionalString; inherit (stdenv.lib) optionals optionalString;
in in

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

@ -1066,8 +1066,6 @@ let
mktemp = callPackage ../tools/security/mktemp { }; mktemp = callPackage ../tools/security/mktemp { };
mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
modemmanager = callPackage ../tools/networking/modemmanager {}; modemmanager = callPackage ../tools/networking/modemmanager {};
monit = builderDefsPackage ../tools/system/monit { monit = builderDefsPackage ../tools/system/monit {
@ -2484,6 +2482,8 @@ let
menhir = callPackage ../development/ocaml-modules/menhir { }; menhir = callPackage ../development/ocaml-modules/menhir { };
mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
ocaml_batteries = callPackage ../development/ocaml-modules/batteries { ocaml_batteries = callPackage ../development/ocaml-modules/batteries {
camomile = camomile_0_8_2; camomile = camomile_0_8_2;
}; };