* 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

5 files changed, 16 insertions, 13 deletions

diff --git a/pkgs/applications/editors/emacs-22/default.nix b/pkgs/applications/editors/emacs-22/default.nix
index d2b47ca9ff9..503a715d16a 100644
--- a/pkgs/applications/editors/emacs-22/default.nix
+++ b/pkgs/applications/editors/emacs-22/default.nix
@@ -6,9 +6,9 @@
 , pkgconfig ? null, gtk ? null
 }:
 
-assert xawSupport -> libXaw != null;
+assert xawSupport && !xaw3dSupport -> libXaw != null;
+assert xawSupport && xaw3dSupport -> Xaw3d != null;
 assert xpmSupport -> libXpm != null;
-assert xaw3dSupport -> Xaw3d != null;
 assert gtkGUI -> pkgconfig != null && gtk != null;
 
 stdenv.mkDerivation {
@@ -21,9 +21,8 @@ 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)
   ] ++ (if gtkGUI then [pkgconfig gtk] else []);
   configureFlags =
     if gtkGUI then ["--with-x-toolkit=gtk"] else [];
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index d0ee37b01ce..5a11e156e58 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)
   ];
 }
diff --git a/pkgs/development/libraries/Xaw3d/builder.sh b/pkgs/development/libraries/Xaw3d/builder.sh
index d64102b4f66..bbe01704175 100644
--- a/pkgs/development/libraries/Xaw3d/builder.sh
+++ b/pkgs/development/libraries/Xaw3d/builder.sh
@@ -15,6 +15,10 @@ buildPhase() {
 
 installPhase() {
     make install SHLIBDIR=$out/lib USRLIBDIR=$out/lib INCDIR=$out/include
+    cd $out/include/X11 && ln -s Xaw3d Xaw
+
+    ensureDir "$out/nix-support"
+    echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
 }
 
 makeFlags="CDEBUGFLAGS=" # !!! awful hack
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix
index dd5e5ccc5c3..8b3a405f3e1 100644
--- a/pkgs/development/libraries/Xaw3d/default.nix
+++ b/pkgs/development/libraries/Xaw3d/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, x11, xmkmf, makedepend, libXmu, libXpm, libXp, bison, flex}:
+{stdenv, fetchurl, x11, imake, makedepend, libXmu, libXpm, libXp, bison, flex}:
 
 stdenv.mkDerivation {
   name = "Xaw3d-1.5E";
@@ -8,5 +8,6 @@ stdenv.mkDerivation {
     md5 = "29ecfdcd6bcf47f62ecfd672d31269a1";
   };
   patches = [./config.patch];
-  buildInputs = [x11 xmkmf makedepend libXmu libXpm libXp bison flex];
+  buildInputs = [x11 imake makedepend libXmu libXpm libXp bison flex];
+  propagatedBuildInputs = [x11 libXmu];
 }
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 88bec624678..b66d7ade659 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -14,7 +14,7 @@ rec {
 
   ### Symbolic names.
 
-  useOldXLibs = true;
+  useOldXLibs = false;
 
   # `xlibs' is the set of X library components.  This used to be the
   # old modular X libraries project (called `xlibs') but now it's just
@@ -1138,7 +1138,7 @@ rec {
     inherit fetchurl stdenv x11 bison;
     flex = flexnew;
     # !!! makedepend is impure
-    inherit (xlibs) xmkmf makedepend libXmu libXpm libXp;
+    inherit (xlibs) imake makedepend libXmu libXpm libXp;
   };
 
   libdrm = import ../development/libraries/libdrm {
@@ -1993,7 +1993,7 @@ rec {
   emacs = (import ../applications/editors/emacs) {
     inherit fetchurl stdenv x11 Xaw3d;
     inherit (xlibs) libXaw libXpm;
-    xaw3dSupport = false;
+    xaw3dSupport = true;
   };
 
   emacs22 = (import ../applications/editors/emacs-22) {