alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Overriding some xorg expressions for them to cross-build. Now SDL cross-builds clean.

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18501
This commit is contained in:
Lluís Batlle i Rossell 2009-11-21 14:49:25 +00:00
parent ca5d91aa60
commit d0d2c6e3fe
1 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkgs/servers/x11/xorg/overrides.nix
View file

@ -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 // {