From 29dae7ef337ba26ab408614557d021bd44deb8b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 20 Mar 2014 16:11:43 +0100 Subject: [PATCH] Trying to fix GNU readline 6.3 build on Darwin I copied the stdenv override used for readline 6.2. Peter Simons notified me of the failure: http://hydra.nixos.org/build/9672338 --- pkgs/top-level/all-packages.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 392ad1b290b8..da5ff3e095f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5590,7 +5590,14 @@ let else stdenv; }; - readline63 = callPackage ../development/libraries/readline/readline6.3.nix { }; + readline63 = callPackage ../development/libraries/readline/readline6.3.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 { };