diff options
| author | Peter Simons <simons@cryp.to> | 2009-10-02 13:57:26 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2009-10-02 13:57:26 +0000 |
| commit | 49afefdb19226f01aab6ba5a3d21cbf6c91874b0 (patch) | |
| tree | 804c1e6e0d0873fff95caa7aa48cb8cce6871405 /pkgs/top-level | |
| parent | 1570ccf3cf975cf3f005bbe20d82814e5fc1e7fa (diff) | |
| download | nixlib-49afefdb19226f01aab6ba5a3d21cbf6c91874b0.tar nixlib-49afefdb19226f01aab6ba5a3d21cbf6c91874b0.tar.gz nixlib-49afefdb19226f01aab6ba5a3d21cbf6c91874b0.tar.bz2 nixlib-49afefdb19226f01aab6ba5a3d21cbf6c91874b0.tar.lz nixlib-49afefdb19226f01aab6ba5a3d21cbf6c91874b0.tar.xz nixlib-49afefdb19226f01aab6ba5a3d21cbf6c91874b0.tar.zst nixlib-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/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf850145ba58..538be82c612e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6631,7 +6631,7 @@ let libpng libjpeg libungif libtiff texinfo dbus; inherit (xlibs) libXaw libXpm libXft; inherit (gtkLibs) gtk; - xawSupport = getPkgConfig "emacs" "xawSupport" false; + xawSupport = system == "i686-darwin" || getPkgConfig "emacs" "xawSupport" false; xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false; gtkGUI = getPkgConfig "emacs" "gtkSupport" true; xftSupport = getPkgConfig "emacs" "xftSupport" true; |