mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
Finally, a real text editor in Nix. Todo: allow configuration with modes.
svn path=/nixpkgs/trunk/; revision=1543
This commit is contained in:
parent
5ef6c2a34e
commit
8648397304
13
pkgs/applications/editors/emacs/builder.sh
Normal file
13
pkgs/applications/editors/emacs/builder.sh
Normal file
@ -0,0 +1,13 @@
|
||||
. $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
|
14
pkgs/applications/editors/emacs/default.nix
Normal file
14
pkgs/applications/editors/emacs/default.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{stdenv, fetchurl, xlibs}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "emacs-21.3";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = http://ftp.gnu.org/pub/gnu/emacs/emacs-21.3.tar.gz;
|
||||
md5 = "a0bab457cbf5b4f8eb99d1d0a3ada420";
|
||||
};
|
||||
patches = [./patchfile];
|
||||
inherit (xlibs) libXaw libX11;
|
||||
|
||||
buildInputs = [xlibs.libXaw xlibs.libX11];
|
||||
}
|
41
pkgs/applications/editors/emacs/patchfile
Normal file
41
pkgs/applications/editors/emacs/patchfile
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~
|
@ -860,6 +860,10 @@ rec {
|
||||
inherit (xlibs) libXt libXp libXext libX11;
|
||||
};
|
||||
|
||||
emacs = (import ../applications/editors/emacs) {
|
||||
inherit fetchurl stdenv xlibs;
|
||||
};
|
||||
|
||||
nxml = (import ../applications/editors/emacs/modes/nxml) {
|
||||
inherit fetchurl stdenv;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user