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

emacs: Allow non-GTK X11 builds (--with-x-toolkit=lucid).

Browse Source
This commit is contained in:
Petr Rockai 2013-12-31 13:27:32 +01:00
parent 251fc454ba
commit e3fae16a29
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
, 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, cairo , alsaLib, cairo
, withX ? !stdenv.isDarwin , withX ? !stdenv.isDarwin, withGTK ? true
}: }:
assert (libXft != null) -> libpng != null; # probably a bug assert (libXft != null) -> libpng != null; # probably a bug
@ -27,11 +27,13 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional stdenv.isDarwin cairo; ++ stdenv.lib.optional stdenv.isDarwin cairo;
configureFlags = configureFlags =
( if withX then ( if withX && withGTK then
[ "--with-x-toolkit=gtk" "--with-xft"] [ "--with-x-toolkit=gtk" "--with-xft"]
else (if withX then
[ "--with-x-toolkit=lucid" "--with-xft" ]
else else
[ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
"--with-gif=no" "--with-tiff=no" ] ) "--with-gif=no" "--with-tiff=no" ] ) )
# On NixOS, help Emacs find `crt*.o'. # On NixOS, help Emacs find `crt*.o'.
++ stdenv.lib.optional (stdenv ? glibc) ++ stdenv.lib.optional (stdenv ? glibc)
[ "--with-crt-dir=${stdenv.glibc}/lib" ]; [ "--with-crt-dir=${stdenv.glibc}/lib" ];

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

@ -7571,7 +7571,7 @@ let
emacs24 = callPackage ../applications/editors/emacs-24 { emacs24 = callPackage ../applications/editors/emacs-24 {
# use override to enable additional features # use override to enable additional features
libXaw = if stdenv.isDarwin then xlibs.libXaw else null; libXaw = xlibs.libXaw;
Xaw3d = null; Xaw3d = null;
gconf = null; gconf = null;
librsvg = null; librsvg = null;