From 7ac6b10446c014c62a0c80fa4ee392d494064de5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Aug 2013 16:02:26 +0200 Subject: [PATCH] emacs: Support building without GTK+ --- pkgs/applications/editors/emacs-24/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 38ae8f47d7f..0e4c9a14d20 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" ];