Move libXaw fix from default.nix to overrides.nix.

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

2 files changed, 18 insertions, 16 deletions

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index efe5d06a08b5..74bfc27aae6c 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -665,19 +665,6 @@ let
       sha256 = "1yaslcpj6sd6s8gx2hv60gfjf515gggd8f2jv4zqbp5q9wcapx0i";
     };
     buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ];
-
-    # The libXaw installation is broken on MacOS X. The package has hard-coded
-    # know-how that assumes shared libraries use an .so suffix. MacOS, however,
-    # uses .dylib. Furthermore, the package fails to install an unversioned
-    # libtool .la file for the library.
-    postInstall = ''
-      cd $out/lib
-      ln -s libXaw8.la libXaw.la
-      if [ ${stdenv.system} = "i686-darwin" ]; then
-        rm *.so*
-	ln -s libXaw8.dylib libXaw.dylib
-      fi
-    '';
   })) // {inherit printproto libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ;};
     
   libXcomposite = (stdenv.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) {
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index b7c0f930cf8c..6fe4751ce687 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -6,13 +6,13 @@
     postInstall =
       ''
         ln -s ${xorg.fontalias}/lib/X11/fonts/misc/fonts.alias $out/lib/X11/fonts/misc/fonts.alias
-      ''; 
+      '';
   };
 
   imake = attrs: attrs // {
     inherit (xorg) xorgcffiles;
     x11BuildHook = ./imake.sh;
-    patches = [./imake.patch]; 
+    patches = [./imake.patch];
   };
 
   mkfontdir = attrs: attrs // {
@@ -23,6 +23,21 @@
     patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
   };
 
+  libXaw = attrs: attrs // {
+    # The libXaw installation is broken on MacOS X. The package has hard-coded
+    # know-how that assumes shared libraries use an .so suffix. MacOS, however,
+    # uses .dylib. Furthermore, the package fails to install an unversioned
+    # libtool .la file for the library.
+    postInstall = ''
+      cd $out/lib
+      ln -s libXaw8.la libXaw.la
+      if [ ${args.stdenv.system} = "i686-darwin" ]; then
+        rm *.so*
+        ln -s libXaw8.dylib libXaw.dylib
+      fi
+    '';
+  };
+
   setxkbmap = attrs: attrs // {
     postInstall =
       ''
@@ -79,5 +94,5 @@
   libSM = attrs: attrs // args.stdenv.lib.optionalAttrs (args.stdenv.system == "i686-darwin") {
     configureFlags = "LIBUUID_CFLAGS='' LIBUUID_LIBS=''";
   };
-  
+
 }