[Nix-commits] SVN commit: nix - r26255 - nixpkgs/trunk/pkgs/applications/editors/emacs-23

[Ludovic Courtès]

Author: ludo
Date: Thu Mar 10 14:53:41 2011
New Revision: 26255
URL: https://svn.nixos.org/websvn/nix/?rev=26255&sc=1

Log:
GNU Emacs 23.3.

Modified:
   nixpkgs/trunk/pkgs/applications/editors/emacs-23/default.nix

Modified: nixpkgs/trunk/pkgs/applications/editors/emacs-23/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/editors/emacs-23/default.nix        Thu Mar 
10 14:53:36 2011        (r26254)
+++ nixpkgs/trunk/pkgs/applications/editors/emacs-23/default.nix        Thu Mar 
10 14:53:41 2011        (r26255)
@@ -8,13 +8,13 @@
 assert stdenv.isDarwin -> libXaw != null;      # fails to link otherwise
 
 stdenv.mkDerivation rec {
-  name = "emacs-23.2";
+  name = "emacs-23.3";
 
   builder = ./builder.sh;
 
   src = fetchurl {
     url = "mirror://gnu/emacs/${name}.tar.bz2";
-    sha256 = "1i96hp91s86jawrqjhfxm5y2sjxizv99009128b4bh06bgx6dm7z";
+    sha256 = "0kfa546qi0idkwk29gclgi13qd8q54pcqgy9qwjknlclszprdp3a";
   };
 
   buildInputs = [
@@ -23,7 +23,11 @@
   ];
 
   configureFlags =
-    stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft" ];
+    stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft"]
+
+    # On NixOS, help Emacs find `crt*.o'.
+    ++ stdenv.lib.optional (stdenv ? glibc)
+         [ "--with-crt-dir=${stdenv.glibc}/lib" ];
 
   doCheck = true;
 
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits