From 75f636067eb94f46731b1edc4ab82417e027751c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 25 Apr 2012 14:21:41 +0000 Subject: [PATCH] GNU Emacs 23: Use Apple-GCC on Darwin. svn path=/nixpkgs/trunk/; revision=33919 --- pkgs/top-level/all-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85148250df8..ea767ac4b9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6569,6 +6569,13 @@ let }; emacs23 = callPackage ../applications/editors/emacs-23 { + stdenv = + if stdenv.isDarwin + /* On Darwin, use Apple-GCC, otherwise: + configure: error: C preprocessor "cc -E -no-cpp-precomp" fails sanity check */ + then overrideGCC stdenv gccApple + else stdenv; + # use override to select the appropriate gui toolkit libXaw = if stdenv.isDarwin then xlibs.libXaw else null; Xaw3d = null;