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

emacs-24.0.92

Browse Source 
svn path=/nixpkgs/trunk/; revision=31763
This commit is contained in:
Florian Friesdorf 2012-01-21 18:28:57 +00:00
parent aa277f7d06
commit 0d2d1dd139
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/editors/emacs-24/default.nix
View File

@ -1,25 +1,30 @@
{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, texinfo, gconf , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
}: }:
# XXX: ?
# - checking for alsa >= 1.0.0... no
# - checking for Wand >= 6.2.8... no
# - imagemagickBig instead of imagemagick?
assert (gtk != null) -> (pkgconfig != null); assert (gtk != null) -> (pkgconfig != null);
assert (libXft != null) -> libpng != null; # probably a bug assert (libXft != null) -> libpng != null; # probably a bug
assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "emacs-23.3"; name = "emacs-24.0.92";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = "mirror://gnu/emacs/${name}.tar.bz2"; url = "http://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.gz";
sha256 = "0kfa546qi0idkwk29gclgi13qd8q54pcqgy9qwjknlclszprdp3a"; sha256 = "0pwps72zj7mm6asly1vdq46dcj3in4qrkb6ss9xq6nbf039nj4w6";
}; };
buildInputs = buildInputs =
[ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif [ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif
libtiff librsvg libXft gconf libtiff librsvg libXft gconf libxml2 imagemagick gnutls
] ]
++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ] ++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ]
++ stdenv.lib.optional stdenv.isLinux dbus; ++ stdenv.lib.optional stdenv.isLinux dbus;
@ -44,7 +49,7 @@ EOF
doCheck = true; doCheck = true;
meta = { meta = {
description = "GNU Emacs 23.x, the extensible, customizable text editor"; description = "PRETEST: GNU Emacs 24.x, the extensible, customizable text editor";
longDescription = '' longDescription = ''
GNU Emacs is an extensible, customizable text editor—and more. At its GNU Emacs is an extensible, customizable text editor—and more. At its

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

@ -6635,6 +6635,17 @@ let
librsvg = null /* if stdenv.isDarwin then null else librsvg */; librsvg = null /* if stdenv.isDarwin then null else librsvg */;
}; };
emacs24 = lowPrio (callPackage ../applications/editors/emacs-24 {
# use override to select the appropriate gui toolkit
libXaw = if stdenv.isDarwin then xlibs.libXaw else null;
Xaw3d = null;
gtk = if stdenv.isDarwin then null else gtkLibs.gtk;
# TODO: these packages don't build on Darwin.
# XXX: Do we want gconf by default? What is emacs using it for?
gconf = null /* if stdenv.isDarwin then null else gnome.GConf */;
librsvg = if stdenv.isDarwin then null else librsvg;
});
emacsSnapshot = lowPrio (callPackage ../applications/editors/emacs-snapshot { emacsSnapshot = lowPrio (callPackage ../applications/editors/emacs-snapshot {
xawSupport = getConfig [ "emacs" "xawSupport" ] false; xawSupport = getConfig [ "emacs" "xawSupport" ] false;
xaw3dSupport = getConfig [ "emacs" "xaw3dSupport" ] false; xaw3dSupport = getConfig [ "emacs" "xaw3dSupport" ] false;
@ -6701,6 +6712,7 @@ let
emacs22Packages = emacsPackages emacs22 pkgs.emacs22Packages; emacs22Packages = emacsPackages emacs22 pkgs.emacs22Packages;
emacs23Packages = recurseIntoAttrs (emacsPackages emacs23 pkgs.emacs23Packages); emacs23Packages = recurseIntoAttrs (emacsPackages emacs23 pkgs.emacs23Packages);
emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages);
epdfview = callPackage ../applications/misc/epdfview { }; epdfview = callPackage ../applications/misc/epdfview { };