summary refs log tree commit diff
path: root/pkgs/applications/editors/emacs-24
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2015-04-14 09:16:21 -0500
committerThomas Tuegel <ttuegel@gmail.com>2015-04-14 09:16:21 -0500
commite75a0c50bd9ec73b1f5f51ca91f5921cb509cf5a (patch)
tree4a9ebb8575fa4c245b6735061e64fbf828dfee2b /pkgs/applications/editors/emacs-24
parent4213e9f30ff0a701461b75724f6cb09da0c9c1c8 (diff)
downloadnixlib-e75a0c50bd9ec73b1f5f51ca91f5921cb509cf5a.tar
nixlib-e75a0c50bd9ec73b1f5f51ca91f5921cb509cf5a.tar.gz
nixlib-e75a0c50bd9ec73b1f5f51ca91f5921cb509cf5a.tar.bz2
nixlib-e75a0c50bd9ec73b1f5f51ca91f5921cb509cf5a.tar.lz
nixlib-e75a0c50bd9ec73b1f5f51ca91f5921cb509cf5a.tar.xz
nixlib-e75a0c50bd9ec73b1f5f51ca91f5921cb509cf5a.tar.zst
nixlib-e75a0c50bd9ec73b1f5f51ca91f5921cb509cf5a.zip
emacs: allow gtk without X on Darwin
Diffstat (limited to 'pkgs/applications/editors/emacs-24')
-rw-r--r--pkgs/applications/editors/emacs-24/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index 80fed602474e..c6060d2720bc 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -9,8 +9,8 @@
 
 assert (libXft != null) -> libpng != null;	# probably a bug
 assert stdenv.isDarwin -> libXaw != null;	# fails to link otherwise
-assert withGTK2 -> withX;
-assert withGTK3 -> withX;
+assert withGTK2 -> withX || stdenv.isDarwin;
+assert withGTK3 -> withX || stdenv.isDarwin;
 assert withGTK2 -> !withGTK3 && gtk2 != null;
 assert withGTK3 -> !withGTK2 && gtk3 != null;