mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 04:12:44 +03:00
* Emacs 22.0.50 (CVS dump).
svn path=/nixpkgs/trunk/; revision=4359
This commit is contained in:
parent
6407d2ca9b
commit
444ac39ad3
13
pkgs/applications/editors/emacs-22/builder.sh
Normal file
13
pkgs/applications/editors/emacs-22/builder.sh
Normal 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
|
41
pkgs/applications/editors/emacs-22/crt.patch
Normal file
41
pkgs/applications/editors/emacs-22/crt.patch
Normal 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~
|
30
pkgs/applications/editors/emacs-22/default.nix
Normal file
30
pkgs/applications/editors/emacs-22/default.nix
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
{ xawSupport ? true
|
||||||
|
, xpmSupport ? true
|
||||||
|
, xaw3dSupport ? false
|
||||||
|
, gtkGUI ? false
|
||||||
|
, stdenv, fetchurl, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
|
||||||
|
, pkgconfig ? null, gtk ? null
|
||||||
|
}:
|
||||||
|
|
||||||
|
assert xawSupport -> libXaw != null;
|
||||||
|
assert xpmSupport -> libXpm != null;
|
||||||
|
assert xaw3dSupport -> Xaw3d != null;
|
||||||
|
assert gtkGUI -> pkgconfig != null && gtk != null;
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "emacs-22.0.50-pre20051207";
|
||||||
|
builder = ./builder.sh;
|
||||||
|
src = fetchurl {
|
||||||
|
url = http://losser.st-lab.cs.uu.nl/~eelco/dist/emacs-22.0.50.tar.bz2;
|
||||||
|
md5 = "011d40367015691e4319ddc65b4e7843";
|
||||||
|
};
|
||||||
|
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 []);
|
||||||
|
configureFlags =
|
||||||
|
if gtkGUI then ["--with-x-toolkit=gtk"] else [];
|
||||||
|
}
|
4
pkgs/applications/editors/emacs-22/modes/cua/builder.sh
Normal file
4
pkgs/applications/editors/emacs-22/modes/cua/builder.sh
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
source $stdenv/setup
|
||||||
|
|
||||||
|
mkdir -p $out/emacs/site-lisp
|
||||||
|
cp $src $out/emacs/site-lisp/cua.el
|
8
pkgs/applications/editors/emacs-22/modes/cua/default.nix
Normal file
8
pkgs/applications/editors/emacs-22/modes/cua/default.nix
Normal 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";
|
||||||
|
};
|
||||||
|
}
|
@ -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
|
@ -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";
|
||||||
|
};
|
||||||
|
}
|
7
pkgs/applications/editors/emacs-22/modes/nxml/builder.sh
Normal file
7
pkgs/applications/editors/emacs-22/modes/nxml/builder.sh
Normal 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-*
|
@ -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";
|
||||||
|
};
|
||||||
|
}
|
@ -1822,6 +1822,14 @@ rec {
|
|||||||
xaw3dSupport = false;
|
xaw3dSupport = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
emacs22 = (import ../applications/editors/emacs-22) {
|
||||||
|
inherit fetchurl stdenv pkgconfig x11 Xaw3d;
|
||||||
|
inherit (xlibs) libXaw libXpm;
|
||||||
|
inherit (gtkLibs) gtk;
|
||||||
|
xaw3dSupport = false;
|
||||||
|
gtkGUI = true;
|
||||||
|
};
|
||||||
|
|
||||||
nxml = (import ../applications/editors/emacs/modes/nxml) {
|
nxml = (import ../applications/editors/emacs/modes/nxml) {
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user