about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-08-20 16:02:26 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-08-21 11:47:57 +0200
commit7ac6b10446c014c62a0c80fa4ee392d494064de5 (patch)
tree788d25d24631a4be62f96cbfed883a3838b1ca73 /pkgs
parentb9fff8a34b9d8086c4feef329c5db1f665d5cdf4 (diff)
downloadnixlib-7ac6b10446c014c62a0c80fa4ee392d494064de5.tar
nixlib-7ac6b10446c014c62a0c80fa4ee392d494064de5.tar.gz
nixlib-7ac6b10446c014c62a0c80fa4ee392d494064de5.tar.bz2
nixlib-7ac6b10446c014c62a0c80fa4ee392d494064de5.tar.lz
nixlib-7ac6b10446c014c62a0c80fa4ee392d494064de5.tar.xz
nixlib-7ac6b10446c014c62a0c80fa4ee392d494064de5.tar.zst
nixlib-7ac6b10446c014c62a0c80fa4ee392d494064de5.zip
emacs: Support building without GTK+
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/editors/emacs-24/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index 38ae8f47d7f0..0e4c9a14d20d 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -26,8 +26,10 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isLinux dbus;
 
   configureFlags =
-    stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft"]
-
+    (if gtk != null then 
+      [ "--with-x-toolkit=gtk" "--with-xft"]
+    else
+      [ "--with-x-toolkit=no" ])
     # On NixOS, help Emacs find `crt*.o'.
     ++ stdenv.lib.optional (stdenv ? glibc)
          [ "--with-crt-dir=${stdenv.glibc}/lib" ];