emacs-22: Remove

This commit is contained in:
Eelco Dolstra 2013-01-29 11:39:38 +01:00
parent e0afec2edc
commit eeb116a2eb
3 changed files with 0 additions and 108 deletions

View file

@ -1,27 +0,0 @@
source $stdenv/setup
preConfigure() {
libc=$(cat ${NIX_GCC}/nix-support/orig-libc)
echo "libc: $libc"
case "${system}" in
x86_64-*) glibclibdir=lib64 ;;
*) glibclibdir=lib ;;
esac
for i in src/s/*.h src/m/*.h; do
substituteInPlace $i \
--replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \
--replace /usr/${glibclibdir}/crti.o $libc/${glibclibdir}/crti.o \
--replace /usr/${glibclibdir}/crtn.o $libc/${glibclibdir}/crtn.o \
--replace /usr/lib/crt1.o $libc/${glibclibdir}/crt1.o \
--replace /usr/lib/crti.o $libc/${glibclibdir}/crti.o \
--replace /usr/lib/crtn.o $libc/${glibclibdir}/crtn.o
done
for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do
substituteInPlace $i --replace /bin/pwd pwd
done
}
genericBuild

View file

@ -1,58 +0,0 @@
{ xawSupport ? true
, xpmSupport ? true
, xaw3dSupport ? false
, gtkGUI ? false
, stdenv, fetchurl, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
, pkgconfig ? null, gtk ? null
, ncurses
}:
assert xawSupport && !xaw3dSupport -> libXaw != null;
assert xawSupport && xaw3dSupport -> Xaw3d != null;
assert xpmSupport -> libXpm != null;
assert gtkGUI -> pkgconfig != null && gtk != null;
stdenv.mkDerivation rec {
name = "emacs-22.3";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://gnu/emacs/${name}.tar.gz";
sha256 = "05hd89bchcpwzcx5la0alcp0wb7xywvnf98dxrshrqlfvccvgnbv";
};
buildInputs = [ncurses x11]
++ stdenv.lib.optional xawSupport (if xaw3dSupport then Xaw3d else libXaw)
++ stdenv.lib.optional xpmSupport libXpm
++ stdenv.lib.optionals gtkGUI [pkgconfig gtk];
configureFlags =
stdenv.lib.optional gtkGUI "--with-x-toolkit=gtk";
postInstall = ''
cat >$out/share/emacs/site-lisp/site-start.el <<EOF
;; nixos specific load-path
(when (getenv "NIX_PROFILES") (setq load-path
(append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
(split-string (getenv "NIX_PROFILES"))))
load-path)))
EOF
'';
meta = {
description = "GNU Emacs, *the* text editor";
longDescription = ''
GNU Emacs is an extensible, customizable text editorand more.
At its core is an interpreter for Emacs Lisp, a dialect of the
Lisp programming language with extensions to support text
editing.
'';
homepage = http://www.gnu.org/software/emacs/;
license = "GPLv3+";
platforms = stdenv.lib.platforms.all;
};
}

View file

@ -6750,28 +6750,6 @@ let
emacs = emacs24;
emacs22 = callPackage ../applications/editors/emacs-22 {
stdenv =
if stdenv.isDarwin
/* On Darwin, use Apple-GCC, otherwise:
configure: error: C preprocessor "cc -E -no-cpp-precomp" fails sanity check */
then overrideGCC stdenv gccApple
/* Using cpp 4.5, we get:
make[1]: Entering directory `/tmp/nix-build-dhbj8qqmqxwp3iw6sjcgafsrwlwrix1f-emacs-22.3.drv-0/emacs-22.3/lib-src'
Makefile:148: *** recipe commences before first target. Stop.
Apparently, this is because `lib-src/Makefile' is generated by
processing `lib-src/Makefile.in' with cpp, and the escaping rules for
literal backslashes have changed. */
else overrideGCC stdenv gcc44;
xaw3dSupport = config.emacs.xaw3dSupport or false;
gtkGUI = config.emacs.gtkSupport or true;
};
emacs23 = callPackage ../applications/editors/emacs-23 {
stdenv =
if stdenv.isDarwin
@ -6896,7 +6874,6 @@ let
xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { };
};
emacs22Packages = emacsPackages emacs22 pkgs.emacs22Packages;
emacs23Packages = emacsPackages emacs23 pkgs.emacs23Packages;
emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages);