From d0d2c6e3fe1e57ffec460a2330c79c19a9e7c770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 21 Nov 2009 14:49:25 +0000
Subject: [PATCH] Overriding some xorg expressions for them to cross-build. Now
 SDL cross-builds clean.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18501
---
 pkgs/servers/x11/xorg/overrides.nix | 35 ++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 8114567c1b6f..4f25334e3972 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1,5 +1,11 @@
 {args, xorg}:
-
+let
+   setMalloc0ReturnsNullCrossCompiling = ''
+      if test -n "$crossConfig"; then
+        configureFlags="$configureFlags --enable-malloc0returnsnull";
+      fi
+    '';
+in
 {
 
   fontmiscmisc = attrs: attrs // {
@@ -35,8 +41,35 @@
     buildNativeInputs = [ args.python ];
   };
 
+  libX11 = attrs: attrs // {
+    preConfigure = setMalloc0ReturnsNullCrossCompiling;
+  };
+
+  libXrender = attrs: attrs // {
+    preConfigure = setMalloc0ReturnsNullCrossCompiling;
+  };
+
+  libXxf86vm = attrs: attrs // {
+    preConfigure = setMalloc0ReturnsNullCrossCompiling;
+  };
+
+  libXrandr = attrs: attrs // {
+    preConfigure = setMalloc0ReturnsNullCrossCompiling;
+  };
+
+  libXt = attrs: attrs // {
+    preConfigure = setMalloc0ReturnsNullCrossCompiling;
+  };
+
+  libXft = attrs: attrs // {
+    buildInputs = attrs.buildInputs ++ [ xorg.xproto xorg.libX11
+        xorg.renderproto ];
+    preConfigure = setMalloc0ReturnsNullCrossCompiling;
+  };
+
   libXext = attrs: attrs // {
     buildInputs = attrs.buildInputs ++ [xorg.libXau];
+    preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };
 
   libXpm = attrs: attrs // {