Author: ludo
Date: Mon Feb 14 11:01:48 2011
New Revision: 25953
URL: https://svn.nixos.org/websvn/nix/?rev=25953&sc=1
Log:
guile: Tweak `makeCrossBuild'.
Modified:
hydra-config/gnu/trunk/guile/release.nix
Modified: hydra-config/gnu/trunk/guile/release.nix
==============================================================================
--- hydra-config/gnu/trunk/guile/release.nix Mon Feb 14 10:24:18 2011
(r25952)
+++ hydra-config/gnu/trunk/guile/release.nix Mon Feb 14 11:01:48 2011
(r25953)
@@ -129,12 +129,18 @@
name = "guile";
src = tarball;
preConfigure = "export GUILE_FOR_BUILD=${native_guile}/bin/guile";
+ makeFlags = [ "V=1" ];
+
buildNativeInputs =
[ native_guile crosspkgs.gawk crosspkgs.makeWrapper ];
+
buildInputs = with crosspkgs;
- [ readline libtool gmp
- libunistring pkgconfig boehmgc libffi
- ];
+ [ libtool gmp libunistring pkgconfig boehmgc libffi ]
+
+ # XXX: ncurses fails to build on MinGW.
+ ++ (crosspkgs.stdenv.lib.optional (to == crossSystem.i686_pc_mingw32)
+ readline);
+
doCheck = false;
inherit meta buildOutOfSourceTree succeedOnFailure keepBuildDirectory;
}).hostDrv;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
