Author: ludo
Date: Mon Apr 23 23:04:05 2012
New Revision: 33899
URL: https://nixos.org/websvn/nix/?rev=33899&sc=1
Log:
GNU Readline 6.x: Build with Apple-GCC on Darwin.
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 Mon Apr 23 22:31:39
2012 (r33898)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Apr 23 23:04:05
2012 (r33899)
@@ -4644,7 +4644,14 @@
readline5 = callPackage ../development/libraries/readline/readline5.nix { };
- readline6 = callPackage ../development/libraries/readline/readline6.nix { };
+ readline6 = callPackage ../development/libraries/readline/readline6.nix {
+ stdenv =
+ # On Darwin, Readline uses `-arch_only', which is specific to
+ # Apple-GCC. So give it what it expects.
+ if stdenv.isDarwin
+ then overrideGCC stdenv gccApple
+ else stdenv;
+ };
librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
