* Xaw3d: export Xaw header directory and propagate libXmu.

* Emacs: don't depend on libXaw when we're using Xaw3d.
* Enable X11R7.0 over the old XLibs.  Cross fingers :-)

svn path=/nixpkgs/trunk/; revision=4531

1 files changed, 3 insertions, 4 deletions

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index d0ee37b01ce5..5a11e156e58b 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -4,9 +4,9 @@
 , stdenv, fetchurl, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
 }:
 
-assert xawSupport -> libXaw != null;
+assert xawSupport && !xaw3dSupport -> libXaw != null;
+assert xawSupport && xaw3dSupport -> Xaw3d != null;
 assert xpmSupport -> libXpm != null;
-assert xaw3dSupport -> Xaw3d != null;
 
 stdenv.mkDerivation {
   name = "emacs-21.4a";
@@ -18,8 +18,7 @@ stdenv.mkDerivation {
   patches = [./crt.patch];
   buildInputs = [
     x11
-    (if xawSupport then libXaw else null)
+    (if xawSupport then if xaw3dSupport then Xaw3d else libXaw else null)
     (if xpmSupport then libXpm else null)
-    (if xaw3dSupport then Xaw3d else null)
   ];
 }