Author: simons
Date: Tue Aug 16 15:20:48 2011
New Revision: 28616
URL: https://svn.nixos.org/websvn/nix/?rev=28616&sc=1
Log:
all-packages.nix: make 'boost' refer to version 1.46.0 on Darwin
The 1.47.0 version doesn't compile for reasons I cannot debug since I
don't have access to that platform.
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 16 15:20:44
2011 (r28615)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 16 15:20:48
2011 (r28616)
@@ -3023,7 +3023,9 @@
boost144 = callPackage ../development/libraries/boost/1.44.nix { };
boost146 = callPackage ../development/libraries/boost/1.46.nix { };
boost147 = callPackage ../development/libraries/boost/1.47.nix { };
- boost = boost147;
+ # 1.47.0 doesn't compile on Darwin. The issue is probably trivial to
+ # fix, but no-one has done it yet.
+ boost = if stdenv.isDarwin then boost146 else boost147;
# A Boost build with all library variants enabled. Very large (about 250
MB).
boostFull = appendToName "full" (boost.override {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
