Author: ludo
Date: Fri Sep 9 21:53:33 2011
New Revision: 29151
URL: https://ssl.nixos.org/websvn/nix/?rev=29151&sc=1
Log:
mpc: Attempt to fix `build_with_mpfr_with_old_gmp'.
Modified:
hydra-config/gnu/trunk/mpc/release.nix
hydra-config/gnu/trunk/mpfr/release.nix
Modified: hydra-config/gnu/trunk/mpc/release.nix
==============================================================================
--- hydra-config/gnu/trunk/mpc/release.nix Fri Sep 9 21:35:20 2011
(r29150)
+++ hydra-config/gnu/trunk/mpc/release.nix Fri Sep 9 21:53:33 2011
(r29151)
@@ -109,12 +109,15 @@
let
pkgs = import nixpkgs { inherit system; };
- gmp = mpfr_with_old_gmp.passthru.gmp;
build = jobs.build {};
in
pkgs.releaseTools.nixBuild ({
src = tarball;
- buildInputs = [ gmp mpfr_with_old_gmp ];
+
+ # We assume that `mpfr_with_old_gmp' has GMP has one of its
+ # propagated build inputs.
+ buildInputs = [ mpfr_with_old_gmp ];
+
inherit (build) name meta configureFlags preCheck
succeedOnFailure keepBuildDirectory;
});
Modified: hydra-config/gnu/trunk/mpfr/release.nix
==============================================================================
--- hydra-config/gnu/trunk/mpfr/release.nix Fri Sep 9 21:35:20 2011
(r29150)
+++ hydra-config/gnu/trunk/mpfr/release.nix Fri Sep 9 21:53:33 2011
(r29151)
@@ -105,9 +105,8 @@
in
pkgs.releaseTools.nixBuild ({
src = tarball;
- buildInputs = [ gmp ];
+ propagatedBuildInputs = [ gmp ];
inherit (build) name meta succeedOnFailure keepBuildDirectory;
inherit preCheck;
- passthru = { inherit gmp; };
});
}
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
