Author: ludo
Date: Fri Sep 9 19:48:15 2011
New Revision: 29140
URL: https://ssl.nixos.org/websvn/nix/?rev=29140&sc=1
Log:
mpc: Clarify the Valgrind logic.
Modified:
hydra-config/gnu/trunk/mpc/release.nix
Modified: hydra-config/gnu/trunk/mpc/release.nix
==============================================================================
--- hydra-config/gnu/trunk/mpc/release.nix Fri Sep 9 19:43:04 2011
(r29139)
+++ hydra-config/gnu/trunk/mpc/release.nix Fri Sep 9 19:48:15 2011
(r29140)
@@ -43,6 +43,9 @@
};
preCheck = "export GMP_CHECK_RANDOMIZE=true";
+
+ # Return true if we should use Valgrind on the given platform.
+ useValgrind = stdenv: stdenv.isLinux;
in
import ../gnu-jobs.nix {
name = "mpc";
@@ -65,11 +68,11 @@
(pkgs.stdenv.lib.optionals pkgs.stdenv.isCygwin
[ "--enable-static" "--disable-shared" ])
- # Build with Valgrind on GNU/Linux.
- ++ (pkgs.lib.optional pkgs.stdenv.isLinux "--enable-valgrind-tests");
+ ++ (pkgs.lib.optional (useValgrind pkgs.stdenv)
+ "--enable-valgrind-tests");
buildInputs = [ gmp mpfr ]
- ++ (pkgs.lib.optional pkgs.stdenv.isLinux pkgs.valgrind);
+ ++ (pkgs.lib.optional (useValgrind pkgs.stdenv) pkgs.valgrind);
inherit preCheck;
};
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
