Author: ludo
Date: Wed Apr 25 14:21:41 2012
New Revision: 33919
URL: https://nixos.org/websvn/nix/?rev=33919&sc=1
Log:
GNU Emacs 23: Use 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 Wed Apr 25 14:14:20
2012 (r33918)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Apr 25 14:21:41
2012 (r33919)
@@ -6569,6 +6569,13 @@
};
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
