* Added the Emacs 22.0 branch with anti-aliasing (Xft) support.

* Added an option to Adobe Reader to make it start faster (by deleting
  all the plugins).

svn path=/nixpkgs/trunk/; revision=4406
This commit is contained in:
Eelco Dolstra 2005-12-22 10:49:43 +00:00
parent 83afd0c173
commit 4d905aa2ed
12 changed files with 145 additions and 0 deletions

View file

@ -0,0 +1,13 @@
source $stdenv/setup
myglibc=`cat ${NIX_GCC}/nix-support/orig-glibc`
echo "glibc: $myglibc"
postConfigure() {
cp $myglibc/lib/crt1.o src
cp $myglibc/lib/crti.o src
cp $myglibc/lib/crtn.o src
}
postConfigure=postConfigure
genericBuild

View file

@ -0,0 +1,41 @@
Only in emacs-21.3: configure.in~
Only in emacs-21.3: patchfile
Only in emacs-21.3/src: Makefile.in~
diff -rc emacs-orig/src/s/gnu-linux.h emacs-21.3/src/s/gnu-linux.h
*** emacs-orig/src/s/gnu-linux.h 2001-09-28 17:50:04.000000000 +0200
--- emacs-21.3/src/s/gnu-linux.h 2004-10-06 13:13:19.000000000 +0200
***************
*** 173,179 ****
/* GNU/Linux usually has crt0.o in a non-standard place */
#define START_FILES pre-crt0.o /usr/lib/crt0.o
#else
! #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
#endif
#ifdef __ELF__
--- 173,179 ----
/* GNU/Linux usually has crt0.o in a non-standard place */
#define START_FILES pre-crt0.o /usr/lib/crt0.o
#else
! #define START_FILES pre-crt0.o crt1.o crti.o
#endif
#ifdef __ELF__
***************
*** 225,231 ****
#else
#undef LIB_GCC
#define LIB_GCC
! #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
#endif
/* Don't use -g in test compiles in configure.
--- 225,231 ----
#else
#undef LIB_GCC
#define LIB_GCC
! #define LIB_STANDARD -lgcc -lc -lgcc crtn.o
#endif
/* Don't use -g in test compiles in configure.
Only in emacs-21.3/src/s: gnu-linux.h~

View file

@ -0,0 +1,34 @@
{ xawSupport ? true
, xpmSupport ? true
, xaw3dSupport ? false
, gtkGUI ? false
, xftSupport ? false
, stdenv, fetchurl, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
, pkgconfig ? null, gtk ? null, libXft ? null, libpng ? null
}:
assert xawSupport -> libXaw != null;
assert xpmSupport -> libXpm != null;
assert xaw3dSupport -> Xaw3d != null;
assert gtkGUI -> pkgconfig != null && gtk != null;
assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug
stdenv.mkDerivation {
name = "emacs-22.0.50-pre-xft";
builder = ./builder.sh;
src = fetchurl {
url = http://losser.st-lab.cs.uu.nl/~eelco/dist/emacs-22.0.50-xft.tar.bz2;
md5 = "4f96ada6f18513aeb70adc27b7ac862f";
};
patches = [./crt.patch];
buildInputs = [
x11
(if xawSupport then libXaw else null)
(if xpmSupport then libXpm else null)
(if xaw3dSupport then Xaw3d else null)
]
++ (if gtkGUI then [pkgconfig gtk] else [])
++ (if xftSupport then [libXft libpng] else []);
configureFlags =
if gtkGUI then ["--with-x-toolkit=gtk" "--with-xft"] else [];
}

View file

@ -0,0 +1,4 @@
source $stdenv/setup
mkdir -p $out/emacs/site-lisp
cp $src $out/emacs/site-lisp/cua.el

View file

@ -0,0 +1,8 @@
{stdenv, fetchurl}: stdenv.mkDerivation {
name = "cua-mode-2.10";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/cua-mode-2.10.el;
md5 = "5bf5e43f5f38c8383868c7c6c5baca09";
};
}

View file

@ -0,0 +1,6 @@
source $stdenv/setup
mkdir -p $out/emacs/site-lisp
tar zxvf $src
cp haskell-mode*/*.el $out/emacs/site-lisp
cp haskell-mode*/*.hs $out/emacs/site-lisp

View file

@ -0,0 +1,8 @@
{stdenv, fetchurl}: stdenv.mkDerivation {
name = "haskell-mode-1.45";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/haskell-mode-1.45.tar.gz;
md5 = "c609998580cdb9ca8888c7d47d22ca3b";
};
}

View file

@ -0,0 +1,7 @@
source $stdenv/setup
mkdir -p $out/emacs/site-lisp
cd $out/emacs/site-lisp
tar xvfz $src
mv nxml-mode-*/* .
rmdir nxml-mode-*

View file

@ -0,0 +1,8 @@
{stdenv, fetchurl}: stdenv.mkDerivation {
name = "nxml-mode-20041004";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/nxml-mode-20041004.tar.gz;
md5 = "ac137024cf337d6f11d8ab278d39b4db";
};
}

View file

@ -12,6 +12,10 @@ tar xvf AdobeReader/ILINXR.TAR -C $out
# Disable this plugin for now (it needs LDAP, and I'm too lazy to add it). # Disable this plugin for now (it needs LDAP, and I'm too lazy to add it).
rm $out/Reader/intellinux/plug_ins/PPKLite.api rm $out/Reader/intellinux/plug_ins/PPKLite.api
if test -n "$fastStart"; then
rm $out/Reader/intellinux/plug_ins/*.api
fi
glibc=$(cat $NIX_GCC/nix-support/orig-glibc) glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
fullPath= fullPath=

View file

@ -1,6 +1,7 @@
{ xineramaSupport ? false { xineramaSupport ? false
, stdenv, fetchurl, libXt, libXp, libXext, libX11, libXinerama ? null , stdenv, fetchurl, libXt, libXp, libXext, libX11, libXinerama ? null
, glib, pango, atk, gtk, libstdcpp5, zlib , glib, pango, atk, gtk, libstdcpp5, zlib
, fastStart ? false
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -14,4 +15,5 @@ stdenv.mkDerivation {
libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib
(if xineramaSupport then libXinerama else null) (if xineramaSupport then libXinerama else null)
]; ];
inherit fastStart;
} }

View file

@ -1831,6 +1831,7 @@ rec {
inherit (gtkLibs) glib pango atk gtk; inherit (gtkLibs) glib pango atk gtk;
libstdcpp5 = gcc33.gcc; libstdcpp5 = gcc33.gcc;
xineramaSupport = true; xineramaSupport = true;
fastStart = true;
}; };
eclipse = (import ../applications/editors/eclipse) { eclipse = (import ../applications/editors/eclipse) {
@ -1871,6 +1872,15 @@ rec {
gtkGUI = true; gtkGUI = true;
}; };
emacs22aa = (import ../applications/editors/emacs-22-aa) {
inherit fetchurl stdenv pkgconfig x11 Xaw3d libpng;
inherit (xlibs) libXaw libXpm libXft;
inherit (gtkLibs) gtk;
xaw3dSupport = false;
gtkGUI = true;
xftSupport = true;
};
nxml = (import ../applications/editors/emacs/modes/nxml) { nxml = (import ../applications/editors/emacs/modes/nxml) {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };