Author: ludo Date: Sun May 29 12:27:56 2011 New Revision: 27314 URL: https://svn.nixos.org/websvn/nix/?rev=27314&sc=1
Log: gmp: Disable `--enable-fat' on i686-darwin. Requested by Marc Glisse <[email protected]>. Modified: hydra-config/gnu/trunk/gmp/release.nix Modified: hydra-config/gnu/trunk/gmp/release.nix ============================================================================== --- hydra-config/gnu/trunk/gmp/release.nix Sat May 28 20:08:49 2011 (r27313) +++ hydra-config/gnu/trunk/gmp/release.nix Sun May 29 12:27:56 2011 (r27314) @@ -39,7 +39,10 @@ }; buildInputsFrom = pkgs: [ pkgs.gnum4 ]; - configureFlags = [ "--enable-cxx" "--enable-fat" ]; + configureFlagsFor = stdenv: + [ "--enable-cxx" ] + ++ (stdenv.lib.optional (stdenv.system != "i686-darwin") + [ "--enable-fat" ]); in import ../gnu-jobs.nix { name = "gmp"; @@ -59,17 +62,17 @@ build = pkgs: { buildInputs = (buildInputsFrom pkgs); - inherit configureFlags; + configureFlags = configureFlagsFor pkgs.stdenv; }; coverage = pkgs: { buildInputs = (buildInputsFrom pkgs); - inherit configureFlags; + configureFlags = configureFlagsFor pkgs.stdenv; }; xbuild_gnu = pkgs: { buildNativeInputs = (buildInputsFrom pkgs); - inherit configureFlags; + configureFlags = configureFlagsFor pkgs.stdenv; }; }; } _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
