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

* Emacs 22.1. This is the default now, but 21.4 is still around

Browse Source 
(as is the 23.0.0.1 alpha).

svn path=/nixpkgs/trunk/; revision=9175
This commit is contained in:
Eelco Dolstra 2007-08-20 13:48:56 +00:00
parent f1cf8d1d7a
commit 16c6da0129
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/applications/editors/emacs/builder.sh → pkgs/applications/editors/emacs-21/builder.sh
View File

0
pkgs/applications/editors/emacs/crt.patch → pkgs/applications/editors/emacs-21/crt.patch
View File

0
pkgs/applications/editors/emacs/default.nix → pkgs/applications/editors/emacs-21/default.nix
View File

9
pkgs/applications/editors/emacs-22/default.nix
View File

@ -4,6 +4,7 @@
, gtkGUI ? false , gtkGUI ? false
, stdenv, fetchurl, x11, libXaw ? null, libXpm ? null, Xaw3d ? null , stdenv, fetchurl, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
, pkgconfig ? null, gtk ? null , pkgconfig ? null, gtk ? null
, ncurses
}: }:
assert xawSupport && !xaw3dSupport -> libXaw != null; assert xawSupport && !xaw3dSupport -> libXaw != null;
@ -12,15 +13,15 @@ assert xpmSupport -> libXpm != null;
assert gtkGUI -> pkgconfig != null && gtk != null; assert gtkGUI -> pkgconfig != null && gtk != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "emacs-22.0.50-pre20051207"; name = "emacs-22.1";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/emacs-22.0.50-pre20051207.tar.bz2; url = http://ftp.nluug.nl/pub/gnu/emacs/emacs-22.1.tar.gz;
md5 = "011d40367015691e4319ddc65b4e7843"; sha256 = "1l1y3il98pq3cz464p244wz2d3nga5lq8fkw5pwp5r97f7pkpi0y";
}; };
patches = [./crt.patch]; patches = [./crt.patch];
buildInputs = [ buildInputs = [
x11 ncurses x11
(if xawSupport then if xaw3dSupport then Xaw3d else libXaw else null) (if xawSupport then if xaw3dSupport then Xaw3d else libXaw else null)
(if xpmSupport then libXpm else null) (if xpmSupport then libXpm else null)
] ++ (if gtkGUI then [pkgconfig gtk] else []); ] ++ (if gtkGUI then [pkgconfig gtk] else []);

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

@ -3029,14 +3029,16 @@ rec {
inherit stdenv fetchurl python perl ncurses x11 zlib openssl; inherit stdenv fetchurl python perl ncurses x11 zlib openssl;
}; };
emacs = import ../applications/editors/emacs { emacs = emacs22;
emacs21 = import ../applications/editors/emacs-21 {
inherit fetchurl stdenv ncurses x11 Xaw3d; inherit fetchurl stdenv ncurses x11 Xaw3d;
inherit (xlibs) libXaw libXpm; inherit (xlibs) libXaw libXpm;
xaw3dSupport = true; xaw3dSupport = true;
}; };
emacs22 = import ../applications/editors/emacs-22 { emacs22 = import ../applications/editors/emacs-22 {
inherit fetchurl stdenv pkgconfig x11 Xaw3d; inherit fetchurl stdenv ncurses pkgconfig x11 Xaw3d;
inherit (xlibs) libXaw libXpm; inherit (xlibs) libXaw libXpm;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
xaw3dSupport = false; xaw3dSupport = false;