Making unison build to byte code in armv5tel. I also fix the build with enableX11 I think.

svn path=/nixpkgs/trunk/; revision=25373
This commit is contained in:
Lluís Batlle i Rossell 2011-01-03 20:52:49 +00:00
parent 45b8ce020f
commit 3aa2bdbab5
1 changed files with 9 additions and 3 deletions

View File

@ -1,6 +1,9 @@
{stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper {stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper, ncurses
, enableX11 ? true}: , enableX11 ? true}:
let
nativeCode = if stdenv.system == "armv5tel-linux" then false else true;
in
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
name = "unison-2.32.52"; name = "unison-2.32.52";
@ -9,13 +12,14 @@ stdenv.mkDerivation (rec {
sha256 = "11844yh1gpjjapn8pvc14hla7g70spwqy6h61qk2is83mpafahhm"; sha256 = "11844yh1gpjjapn8pvc14hla7g70spwqy6h61qk2is83mpafahhm";
}; };
buildInputs = [ocaml makeWrapper]; buildInputs = [ ocaml makeWrapper ncurses ];
preBuild = if enableX11 then '' preBuild = if enableX11 then ''
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" Makefile.OCaml sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" Makefile.OCaml
'' 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 "");
preInstall = "ensureDir $out/bin"; preInstall = "ensureDir $out/bin";
@ -26,6 +30,8 @@ stdenv.mkDerivation (rec {
done done
'' else ""; '' else "";
dontStrip = if ! nativeCode then true else false;
meta = { meta = {
homepage = http://www.cis.upenn.edu/~bcpierce/unison/; homepage = http://www.cis.upenn.edu/~bcpierce/unison/;
description = "Bidirectional file synchronizer"; description = "Bidirectional file synchronizer";