public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add emacs24-nox: emacs built without X (or GTK) libraries.

Browse Source 
This commit also fixes an issue where pkgconfig was only added as a
dependency when gtk support was enabled. This made ./configure unable
to find other libraries (libtiff, libxml2, gnutls, and others).
This commit is contained in:
Moritz Ulrich 2013-08-14 15:02:07 +02:00 committed by Evgeny Egorochkin
parent b86b1b81f5
commit a10812f792
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/editors/emacs-24/default.nix
View File

@ -2,9 +2,9 @@
, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
, alsaLib , alsaLib
, withX ? true
}: }:
assert (gtk != null) -> (pkgconfig != null);
assert (libXft != null) -> libpng != null; # probably a bug 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
@ -19,14 +19,15 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ]
libtiff librsvg libXft gconf libxml2 imagemagick gnutls alsaLib ++ stdenv.lib.optional stdenv.isLinux dbus
] ++ stdenv.lib.optionals withX [
++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ] x11 libXaw Xaw3d libXpm libpng libjpeg libungif
++ stdenv.lib.optional stdenv.isLinux dbus; libtiff librsvg libXft imagemagick gtk
];
configureFlags = configureFlags =
(if gtk != null then (if withX then
[ "--with-x-toolkit=gtk" "--with-xft"] [ "--with-x-toolkit=gtk" "--with-xft"]
else else
[ "--with-x-toolkit=no" ]) [ "--with-x-toolkit=no" ])
@ -69,7 +70,7 @@ EOF
homepage = "http://www.gnu.org/software/emacs/"; homepage = "http://www.gnu.org/software/emacs/";
license = "GPLv3+"; license = "GPLv3+";
maintainers = with maintainers; [ chaoflow lovek323 simons ]; maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

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

@ -7375,6 +7375,10 @@ let
else stdenv; else stdenv;
}; };
emacs24-nox = (appendToName "nox" (emacs24.override {
withX = false;
}));
emacsPackages = emacs: self: let callPackage = newScope self; in rec { emacsPackages = emacs: self: let callPackage = newScope self; in rec {
inherit emacs; inherit emacs;