Author: ludo
Date: Tue Apr 24 08:49:35 2012
New Revision: 33901
URL: https://nixos.org/websvn/nix/?rev=33901&sc=1
Log:
GNU Emacs 22: Use Apple-GCC.
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 Apr 24 07:54:57
2012 (r33900)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Apr 24 08:49:35
2012 (r33901)
@@ -6543,15 +6543,23 @@
emacs = emacs23;
emacs22 = callPackage ../applications/editors/emacs-22 {
- /* Using cpp 4.5, we get:
+ stdenv =
+ if stdenv.isDarwin
- make[1]: Entering directory
`/tmp/nix-build-dhbj8qqmqxwp3iw6sjcgafsrwlwrix1f-emacs-22.3.drv-0/emacs-22.3/lib-src'
- Makefile:148: *** recipe commences before first target. Stop.
+ /* On Darwin, use Apple-GCC, otherwise:
+ configure: error: C preprocessor "cc -E -no-cpp-precomp" fails
sanity check */
+ then overrideGCC stdenv gccApple
+
+ /* Using cpp 4.5, we get:
+
+ make[1]: Entering directory
`/tmp/nix-build-dhbj8qqmqxwp3iw6sjcgafsrwlwrix1f-emacs-22.3.drv-0/emacs-22.3/lib-src'
+ Makefile:148: *** recipe commences before first target. Stop.
+
+ Apparently, this is because `lib-src/Makefile' is generated by
+ processing `lib-src/Makefile.in' with cpp, and the escaping rules for
+ literal backslashes have changed. */
+ else overrideGCC stdenv gcc44;
- Apparently, this is because `lib-src/Makefile' is generated by
- processing `lib-src/Makefile.in' with cpp, and the escaping rules for
- literal backslashes have changed. */
- stdenv = overrideGCC stdenv gcc44;
xaw3dSupport = getConfig [ "emacs" "xaw3dSupport" ] false;
gtkGUI = getConfig [ "emacs" "gtkSupport" ] true;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
