ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-24 20:02:58 +03:00
Code Issues Projects Releases Wiki Activity

GNU Emacs 23.x update (development snapshot).

Browse Source 
svn path=/nixpkgs/trunk/; revision=13994
This commit is contained in:
Ludovic Courtès 2009-02-06 08:43:31 +00:00
parent c4c1aa0a8a
commit f8a207e806
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/emacs-unicode/builder.sh
View File

@ -12,7 +12,7 @@ preConfigure() {
--replace /usr/lib/crtn.o $libc/lib/crtn.o
done
for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in ./admin/unidata/Makefile; do
for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do
substituteInPlace $i --replace /bin/pwd pwd
done
}

15
pkgs/applications/editors/emacs-unicode/default.nix
View File

@ -5,7 +5,7 @@
, xftSupport ? false
, stdenv, fetchurl, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
, pkgconfig ? null, gtk ? null, libXft ? null
, libpng, libjpeg, libungif, libtiff
, libpng, libjpeg, libungif, libtiff, texinfo
}:
assert xawSupport -> libXaw != null;
@ -14,14 +14,15 @@ assert xaw3dSupport -> Xaw3d != null;
assert gtkGUI -> pkgconfig != null && gtk != null;
assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug
let date = "20080228"; in
stdenv.mkDerivation {
name = "emacs-snapshot-23.0.0.1-pre20070705";
name = "emacs-snapshot-23-${date}";
builder = ./builder.sh;
src = fetchurl {
url = http://debs.peadrop.com/pool/edgy/backports/emacs-snapshot_20070705.orig.tar.gz;
sha256 = "1blybacpsxha2v24kj482wl3g1z93rwddfc8rsqsk6dr6f5kdj5q";
url = "http://ppa.launchpad.net/avassalotti/ubuntu/pool/main/e/emacs-snapshot/emacs-snapshot_${date}.orig.tar.gz";
sha256 = "1cix1qjrynidvdyww3g8fm1wyggc82qjxbfbv3rx630szm1v6bm7";
};
# patches = [
@ -29,7 +30,7 @@ stdenv.mkDerivation {
# ];
buildInputs = [
ncurses x11
ncurses x11 texinfo
(if xawSupport then libXaw else null)
(if xpmSupport then libXpm else null)
(if xaw3dSupport then Xaw3d else null)
@ -39,12 +40,12 @@ stdenv.mkDerivation {
++ (if xftSupport then [libXft] else []);
configureFlags = "
${if gtkGUI then "--with-gtk --enable-font-backend --with-xft" else ""}
${if gtkGUI then "--with-x-toolkit=gtk --enable-font-backend --with-xft" else ""}
";
meta = {
description = "Emacs with Unicode, GTK and Xft support (23.x alpha)";
homepage = http://www.emacswiki.org/cgi-bin/wiki/XftGnuEmacs;
license = "GPL";
license = "GPLv3+";
};
}

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

@ -7349,7 +7349,7 @@ let
emacsUnicode = lowPrio (import ../applications/editors/emacs-unicode {
inherit fetchurl stdenv ncurses pkgconfig x11 Xaw3d
libpng libjpeg libungif libtiff;
libpng libjpeg libungif libtiff texinfo;
inherit (xlibs) libXaw libXpm libXft;
inherit (gtkLibs) gtk;
xawSupport = getPkgConfig "emacs" "xawSupport" false;