Author: ludo
Date: Tue Nov 9 09:14:12 2010
New Revision: 24624
URL: https://svn.nixos.org/websvn/nix/?rev=24624&sc=1
Log:
Fix GNU Emacs 22.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Tue Nov
9 09:14:07 2010 (r24623)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Tue Nov
9 09:14:12 2010 (r24624)
@@ -5487,6 +5487,15 @@
emacs = emacs23;
emacs22 = callPackage ../applications/editors/emacs-22 {
+ /* 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. */
+ stdenv = overrideGCC stdenv gcc44;
xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false;
gtkGUI = getPkgConfig "emacs" "gtkSupport" true;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
