From 722c3546af2927e0da89082fc7d49f5dd47aa70b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 17 Feb 2009 21:05:52 +0000
Subject: [PATCH] GNU Emacs live from CVS.

svn path=/nixpkgs/trunk/; revision=14107
---
 .../editors/emacs-unicode/default.nix          | 18 ++++++++++--------
 pkgs/top-level/all-packages.nix                |  5 +++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/emacs-unicode/default.nix b/pkgs/applications/editors/emacs-unicode/default.nix
index 169fe6e0b304..413828272c4f 100644
--- a/pkgs/applications/editors/emacs-unicode/default.nix
+++ b/pkgs/applications/editors/emacs-unicode/default.nix
@@ -3,9 +3,10 @@
 , xaw3dSupport ? false
 , gtkGUI ? false
 , xftSupport ? false
-, stdenv, fetchurl, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
+, stdenv, fetchcvs, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
 , pkgconfig ? null, gtk ? null, libXft ? null
 , libpng, libjpeg, libungif, libtiff, texinfo
+, autoconf, automake
 }:
 
 assert xawSupport -> libXaw != null;
@@ -14,22 +15,23 @@ assert xaw3dSupport -> Xaw3d != null;
 assert gtkGUI -> pkgconfig != null && gtk != null;
 assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug
 
-let date = "20080228"; in
+let date = "2009-02-16"; in
 stdenv.mkDerivation {
   name = "emacs-snapshot-23-${date}";
   
   builder = ./builder.sh;
   
-  src = fetchurl {
-    url = "http://ppa.launchpad.net/avassalotti/ubuntu/pool/main/e/emacs-snapshot/emacs-snapshot_${date}.orig.tar.gz";
-    sha256 = "1cix1qjrynidvdyww3g8fm1wyggc82qjxbfbv3rx630szm1v6bm7";
+  src = fetchcvs {
+    inherit date;
+    cvsRoot = ":pserver:anonymous@cvs.savannah.gnu.org:/sources/emacs";
+    module = "emacs";
+    sha256 = "6ec63da94a199c5f95bf4a9aa578cf14b3d85800fd37b3562d9a446b144b0d47";
   };
 
-#  patches = [
-#    ./crt.patch
-#  ];
+  preConfigure = "autoreconf -vfi";
   
   buildInputs = [
+    autoconf automake
     ncurses x11 texinfo
     (if xawSupport then libXaw else null)
     (if xpmSupport then libXpm else null)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a0f329f3007..f8598796ff72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7781,8 +7781,9 @@ let
   };
 
   emacsUnicode = lowPrio (import ../applications/editors/emacs-unicode {
-    inherit fetchurl stdenv ncurses pkgconfig x11 Xaw3d
-      libpng libjpeg libungif libtiff texinfo;
+    inherit fetchcvs stdenv ncurses pkgconfig x11 Xaw3d
+      libpng libjpeg libungif libtiff texinfo
+      autoconf automake;
     inherit (xlibs) libXaw libXpm libXft;
     inherit (gtkLibs) gtk;
     xawSupport = getPkgConfig "emacs" "xawSupport" false;