diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-21 10:44:22 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-21 10:44:22 +0000 |
commit | ca5d91aa608224368d93599416dd97b16cbe6bbf (patch) | |
tree | 42859876b374a9ae174dada46314fca70c137b3f /pkgs/servers | |
parent | 3136303d632b975a86cc58269c487a3b2aca8b1c (diff) | |
download | nixlib-ca5d91aa608224368d93599416dd97b16cbe6bbf.tar nixlib-ca5d91aa608224368d93599416dd97b16cbe6bbf.tar.gz nixlib-ca5d91aa608224368d93599416dd97b16cbe6bbf.tar.bz2 nixlib-ca5d91aa608224368d93599416dd97b16cbe6bbf.tar.lz nixlib-ca5d91aa608224368d93599416dd97b16cbe6bbf.tar.xz nixlib-ca5d91aa608224368d93599416dd97b16cbe6bbf.tar.zst nixlib-ca5d91aa608224368d93599416dd97b16cbe6bbf.zip |
Made more libraries cross compile. fontconfig, libxcb, bzip2, libdrm, zlib...
I was trying to cross compile SDL. Many dependencies work, but I ended seeing libX11 not ready for cross compilation. Other xorg libraries cross-compile well. libX11 may need a small patch. The problem is the usual "configure test cannot be run in cross compilation", so the configure script halts. I made the pkgconfig expression always return buildDrv, as I think it rarely will be needed as buildInput. So to avoid rewriting all its mentions to use it as buildNativeInput, I prefered this small change. svn path=/nixpkgs/branches/stdenv-updates/; revision=18500
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 23937c8978e2..8114567c1b6f 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -22,7 +22,17 @@ }; libxcb = attrs : attrs // { - buildInputs = attrs.buildInputs ++ [ xorg.xproto ]; + # I only remove python from the original, and add xproto. I don't know how + # to achieve that referring to attrs.buildInputs. + buildInputs = [args.pkgconfig args.libxslt xorg.libpthreadstubs /*xorg.python*/ + xorg.libXau xorg.xcbproto xorg.libXdmcp ] ++ [ xorg.xproto ]; + buildNativeInputs = [ args.python ]; + }; + + xcbproto = attrs : attrs // { + # I only remove python from the original. + buildInputs = [args.pkgconfig /*xorg.python*/ ]; + buildNativeInputs = [ args.python ]; }; libXext = attrs: attrs // { |