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

ocaml, unison: make them build on mips (native compilers)

Browse Source 
I switch off the build of ocaml compilers to native code, and add
a 'passthru' that unison can use to see if it needs to call the native
or the bytecode compiler.
This commit is contained in:
Lluís Batlle i Rossell 2012-07-27 20:37:08 +02:00
parent 32b48d64dc
commit c0832627c4
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/sync/unison/default.nix
View File

@ -1,9 +1,6 @@
{stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper, ncurses {stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper, ncurses
, enableX11 ? true}: , enableX11 ? true}:
let
nativeCode = if stdenv.isArm then false else true;
in
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
name = "unison-2.40.63"; name = "unison-2.40.63";
@ -19,7 +16,7 @@ stdenv.mkDerivation (rec {
'' else ""; '' else "";
makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "") makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "")
+ (if ! nativeCode then " NATIVE=false" else ""); + (if ! ocaml.nativeCompilers then " NATIVE=false" else "");
preInstall = "mkdir -p $out/bin"; preInstall = "mkdir -p $out/bin";
@ -30,7 +27,7 @@ stdenv.mkDerivation (rec {
done done
'' else ""; '' else "";
dontStrip = if ! nativeCode then true else false; dontStrip = if ! ocaml.nativeCompilers then true else false;
meta = { meta = {
homepage = http://www.cis.upenn.edu/~bcpierce/unison/; homepage = http://www.cis.upenn.edu/~bcpierce/unison/;

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

@ -1,8 +1,8 @@
{ stdenv, fetchurl, ncurses, x11 }: { stdenv, fetchurl, ncurses, x11 }:
let let
useX11 = !stdenv.isArm; useX11 = !stdenv.isArm && !stdenv.isMips;
useNativeCompilers = !stdenv.isArm; useNativeCompilers = !stdenv.isArm && !stdenv.isMips;
inherit (stdenv.lib) optionals optionalString; inherit (stdenv.lib) optionals optionalString;
in in
@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
ln -sv $out/lib/ocaml/caml $out/include/caml ln -sv $out/lib/ocaml/caml $out/include/caml
''; '';
passthru = {
nativeCompilers = useNativeCompilers;
};
meta = { meta = {
homepage = http://caml.inria.fr/ocaml; homepage = http://caml.inria.fr/ocaml;
licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];