diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-21 14:49:25 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-21 14:49:25 +0000 |
| commit | d0d2c6e3fe1e57ffec460a2330c79c19a9e7c770 (patch) | |
| tree | 53c76b9e688b33b39389a14fafa4f79cb601608c /pkgs/servers | |
| parent | ca5d91aa608224368d93599416dd97b16cbe6bbf (diff) | |
| download | nixlib-d0d2c6e3fe1e57ffec460a2330c79c19a9e7c770.tar nixlib-d0d2c6e3fe1e57ffec460a2330c79c19a9e7c770.tar.gz nixlib-d0d2c6e3fe1e57ffec460a2330c79c19a9e7c770.tar.bz2 nixlib-d0d2c6e3fe1e57ffec460a2330c79c19a9e7c770.tar.lz nixlib-d0d2c6e3fe1e57ffec460a2330c79c19a9e7c770.tar.xz nixlib-d0d2c6e3fe1e57ffec460a2330c79c19a9e7c770.tar.zst nixlib-d0d2c6e3fe1e57ffec460a2330c79c19a9e7c770.zip | |
Overriding some xorg expressions for them to cross-build. Now SDL cross-builds clean.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18501
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 35 |
1 files changed, 34 insertions, 1 deletions
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 // { |