From 49afefdb19226f01aab6ba5a3d21cbf6c91874b0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 2 Oct 2009 13:57:26 +0000 Subject: emacs-23: hacky fix to libXaw linker errors on MacOS X When building Emacs on MacOS X, the configure script believes that libXaw is available and tries to link it (even when, in fact, libXaw is not available). To work around that problem, we make Xaw support mandatory on MacOS X. svn path=/nixpkgs/trunk/; revision=17610 --- pkgs/applications/editors/emacs-23/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix index 59d8af33f89..866baa41ee8 100644 --- a/pkgs/applications/editors/emacs-23/default.nix +++ b/pkgs/applications/editors/emacs-23/default.nix @@ -15,6 +15,7 @@ assert dbusSupport -> dbus != null; assert xaw3dSupport -> Xaw3d != null; assert gtkGUI -> pkgconfig != null && gtk != null; assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug +assert stdenv.system == "i686-darwin" -> xawSupport; # fails to link otherwise stdenv.mkDerivation rec { name = "emacs-23.1"; -- cgit 1.4.1