summary refs log tree commit diff
path: root/pkgs/applications/editors
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2009-10-02 13:57:26 +0000
committerPeter Simons <simons@cryp.to>2009-10-02 13:57:26 +0000
commit49afefdb19226f01aab6ba5a3d21cbf6c91874b0 (patch)
tree804c1e6e0d0873fff95caa7aa48cb8cce6871405 /pkgs/applications/editors
parent1570ccf3cf975cf3f005bbe20d82814e5fc1e7fa (diff)
downloadnixpkgs-49afefdb19226f01aab6ba5a3d21cbf6c91874b0.tar
nixpkgs-49afefdb19226f01aab6ba5a3d21cbf6c91874b0.tar.gz
nixpkgs-49afefdb19226f01aab6ba5a3d21cbf6c91874b0.tar.bz2
nixpkgs-49afefdb19226f01aab6ba5a3d21cbf6c91874b0.tar.lz
nixpkgs-49afefdb19226f01aab6ba5a3d21cbf6c91874b0.tar.xz
nixpkgs-49afefdb19226f01aab6ba5a3d21cbf6c91874b0.tar.zst
nixpkgs-49afefdb19226f01aab6ba5a3d21cbf6c91874b0.zip
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
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r--pkgs/applications/editors/emacs-23/default.nix1
1 files changed, 1 insertions, 0 deletions
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";