ocaml, unison: make them build on mips (native compilers)
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:
parent
32b48d64dc
commit
c0832627c4
@ -1,9 +1,6 @@
|
||||
{stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper, ncurses
|
||||
, enableX11 ? true}:
|
||||
|
||||
let
|
||||
nativeCode = if stdenv.isArm then false else true;
|
||||
in
|
||||
stdenv.mkDerivation (rec {
|
||||
|
||||
name = "unison-2.40.63";
|
||||
@ -19,7 +16,7 @@ stdenv.mkDerivation (rec {
|
||||
'' 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";
|
||||
|
||||
@ -30,7 +27,7 @@ stdenv.mkDerivation (rec {
|
||||
done
|
||||
'' else "";
|
||||
|
||||
dontStrip = if ! nativeCode then true else false;
|
||||
dontStrip = if ! ocaml.nativeCompilers then true else false;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.cis.upenn.edu/~bcpierce/unison/;
|
||||
|
@ -1,8 +1,8 @@
|
||||
{ stdenv, fetchurl, ncurses, x11 }:
|
||||
|
||||
let
|
||||
useX11 = !stdenv.isArm;
|
||||
useNativeCompilers = !stdenv.isArm;
|
||||
useX11 = !stdenv.isArm && !stdenv.isMips;
|
||||
useNativeCompilers = !stdenv.isArm && !stdenv.isMips;
|
||||
inherit (stdenv.lib) optionals optionalString;
|
||||
in
|
||||
|
||||
@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
|
||||
ln -sv $out/lib/ocaml/caml $out/include/caml
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
nativeCompilers = useNativeCompilers;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = http://caml.inria.fr/ocaml;
|
||||
licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
|
||||
|
Loading…
Reference in New Issue
Block a user