diff options
Diffstat (limited to 'pkgs/applications/editors/emacs-24/default.nix')
| -rw-r--r-- | pkgs/applications/editors/emacs-24/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 470d8f53cb85d..0e4c9a14d20d0 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" ]; @@ -67,7 +69,7 @@ EOF homepage = "http://www.gnu.org/software/emacs/"; license = "GPLv3+"; - maintainers = with maintainers; [ chaoflow lovek323 ludo simons ]; + maintainers = with maintainers; [ chaoflow lovek323 simons ]; platforms = platforms.all; }; } |