nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 01:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

emacs-23: hacky fix to libXaw linker errors on MacOS X

Browse Source 
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
This commit is contained in:
Peter Simons 2009-10-02 13:57:26 +00:00
parent 1570ccf3cf
commit 49afefdb19
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/editors/emacs-23/default.nix
View File

@ -15,6 +15,7 @@ assert dbusSupport -> dbus != null;
assert xaw3dSupport -> Xaw3d != null; assert xaw3dSupport -> Xaw3d != null;
assert gtkGUI -> pkgconfig != null && gtk != null; assert gtkGUI -> pkgconfig != null && gtk != null;
assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug
assert stdenv.system == "i686-darwin" -> xawSupport; # fails to link otherwise
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "emacs-23.1"; name = "emacs-23.1";

2
pkgs/top-level/all-packages.nix
View File

@ -6631,7 +6631,7 @@ let
libpng libjpeg libungif libtiff texinfo dbus; libpng libjpeg libungif libtiff texinfo dbus;
inherit (xlibs) libXaw libXpm libXft; inherit (xlibs) libXaw libXpm libXft;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
xawSupport = getPkgConfig "emacs" "xawSupport" false; xawSupport = system == "i686-darwin" || getPkgConfig "emacs" "xawSupport" false;
xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false; xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false;
gtkGUI = getPkgConfig "emacs" "gtkSupport" true; gtkGUI = getPkgConfig "emacs" "gtkSupport" true;
xftSupport = getPkgConfig "emacs" "xftSupport" true; xftSupport = getPkgConfig "emacs" "xftSupport" true;