Author: viric
Date: Mon Jan 3 20:52:49 2011
New Revision: 25373
URL: https://svn.nixos.org/websvn/nix/?rev=25373&sc=1
Log:
Making unison build to byte code in armv5tel. I also fix the build with
enableX11 I think.
Modified:
nixpkgs/trunk/pkgs/applications/networking/sync/unison/default.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/sync/unison/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/sync/unison/default.nix Mon Jan
3 20:34:27 2011 (r25372)
+++ nixpkgs/trunk/pkgs/applications/networking/sync/unison/default.nix Mon Jan
3 20:52:49 2011 (r25373)
@@ -1,6 +1,9 @@
-{stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper
+{stdenv, fetchurl, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper,
ncurses
, enableX11 ? true}:
+let
+ nativeCode = if stdenv.system == "armv5tel-linux" then false else true;
+in
stdenv.mkDerivation (rec {
name = "unison-2.32.52";
@@ -9,13 +12,14 @@
sha256 = "11844yh1gpjjapn8pvc14hla7g70spwqy6h61qk2is83mpafahhm";
};
- buildInputs = [ocaml makeWrapper];
+ buildInputs = [ ocaml makeWrapper ncurses ];
preBuild = if enableX11 then ''
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo
"${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" Makefile.OCaml
'' 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";
@@ -26,6 +30,8 @@
done
'' else "";
+ dontStrip = if ! nativeCode then true else false;
+
meta = {
homepage = http://www.cis.upenn.edu/~bcpierce/unison/;
description = "Bidirectional file synchronizer";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
