forked from mirrors/nixpkgs
emacs: version emacs-24.1 is out
The 24.x version is still low-prio in nixpkgs until we've figured out how to support multiple 'emacsPackages' sets properly. svn path=/nixpkgs/trunk/; revision=34447
This commit is contained in:
parent
6db9c6f241
commit
b4ebc3bb42
|
@ -9,19 +9,19 @@ assert (libXft != null) -> libpng != null; # probably a bug
|
||||||
assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
|
assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "emacs-24.0.94";
|
name = "emacs-24.1";
|
||||||
|
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.gz";
|
url = "mirror://gnu/emacs/${name}.tar.bz2";
|
||||||
sha256 = "1dgy53dxpnwrn6h3i3z8fpcyasms0wlvhqfyih4cwkz712var393";
|
sha256 = "eeea272732146e2be9aee2f8d71d6cf07b8654c0282da62a26b921d433f02b7c";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif
|
[ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif
|
||||||
libtiff librsvg libXft gconf libxml2 imagemagick gnutls alsaLib
|
libtiff librsvg libXft gconf libxml2 imagemagick gnutls alsaLib
|
||||||
]
|
]
|
||||||
++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ]
|
++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ]
|
||||||
++ stdenv.lib.optional stdenv.isLinux dbus;
|
++ stdenv.lib.optional stdenv.isLinux dbus;
|
||||||
|
|
||||||
|
@ -64,7 +64,7 @@ EOF
|
||||||
separately.
|
separately.
|
||||||
'';
|
'';
|
||||||
|
|
||||||
homepage = http://www.gnu.org/software/emacs/;
|
homepage = "http://www.gnu.org/software/emacs/";
|
||||||
license = "GPLv3+";
|
license = "GPLv3+";
|
||||||
|
|
||||||
maintainers = with stdenv.lib.maintainers; [ ludo simons chaoflow ];
|
maintainers = with stdenv.lib.maintainers; [ ludo simons chaoflow ];
|
||||||
|
|
Loading…
Reference in a new issue