public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GNU Emacs 22: Use Apple-GCC.

Browse Source 
svn path=/nixpkgs/trunk/; revision=33901
This commit is contained in:
Ludovic Courtès 2012-04-24 08:49:35 +00:00
parent 86232ad5f7
commit daaa950c31
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/top-level/all-packages.nix
View File

@ -6543,15 +6543,23 @@ let
emacs = emacs23; emacs = emacs23;
emacs22 = callPackage ../applications/editors/emacs-22 { 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' /* On Darwin, use Apple-GCC, otherwise:
Makefile:148: *** recipe commences before first target. Stop. 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; xaw3dSupport = getConfig [ "emacs" "xaw3dSupport" ] false;
gtkGUI = getConfig [ "emacs" "gtkSupport" ] true; gtkGUI = getConfig [ "emacs" "gtkSupport" ] true;
}; };