pyrox.dev
lol
emacs: Allow non-GTK X11 builds (--with-x-toolkit=lucid).
+6
-4
+5
-3
pkgs/applications/editors/emacs-24/default.nix
+5
-3
pkgs/applications/editors/emacs-24/default.nix
···
2
2
, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
3
3
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
4
4
, alsaLib, cairo
5
-
, withX ? !stdenv.isDarwin
5
+
, withX ? !stdenv.isDarwin, withGTK ? true
6
6
}:
7
7
8
8
assert (libXft != null) -> libpng != null; # probably a bug
···
27
27
++ stdenv.lib.optional stdenv.isDarwin cairo;
28
28
29
29
configureFlags =
30
-
( if withX then
30
+
( if withX && withGTK then
31
31
[ "--with-x-toolkit=gtk" "--with-xft"]
32
+
else (if withX then
33
+
[ "--with-x-toolkit=lucid" "--with-xft" ]
32
34
else
33
35
[ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
34
-
"--with-gif=no" "--with-tiff=no" ] )
36
+
"--with-gif=no" "--with-tiff=no" ] ) )
35
37
# On NixOS, help Emacs find `crt*.o'.
36
38
++ stdenv.lib.optional (stdenv ? glibc)
37
39
[ "--with-crt-dir=${stdenv.glibc}/lib" ];
+1
-1
pkgs/top-level/all-packages.nix
+1
-1
pkgs/top-level/all-packages.nix
···
7571
7571
7572
7572
emacs24 = callPackage ../applications/editors/emacs-24 {
7573
7573
# use override to enable additional features
7574
-
libXaw = if stdenv.isDarwin then xlibs.libXaw else null;
7574
+
libXaw = xlibs.libXaw;
7575
7575
Xaw3d = null;
7576
7576
gconf = null;
7577
7577
librsvg = null;