forked from mirrors/nixpkgs
Using openchrome trunk instead of that distributed with xorg. That
doesn't work in K8N800, and trunk even does a bit of 3D by hw. svn path=/nixpkgs/trunk/; revision=16329
This commit is contained in:
parent
f6533bc527
commit
dab4dc0de1
|
@ -50,7 +50,14 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
xf86videoopenchrome = attrs: attrs // {
|
xf86videoopenchrome = attrs: attrs // {
|
||||||
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
|
src = args.fetchsvn {
|
||||||
|
url = http://svn.openchrome.org/svn/trunk;
|
||||||
|
md5 = "9a64a317d1f0792c5709e516c14f383b";
|
||||||
|
rev = 754;
|
||||||
|
};
|
||||||
|
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa args.automake args.autoconf args.libtool xorg.libXext];
|
||||||
|
preConfigure = "chmod +x autogen.sh";
|
||||||
|
configureScript = "./autogen.sh";
|
||||||
};
|
};
|
||||||
|
|
||||||
xkbcomp = attrs: attrs // {
|
xkbcomp = attrs: attrs // {
|
||||||
|
|
|
@ -4522,9 +4522,10 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
|
xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
|
||||||
inherit fetchurl stdenv pkgconfig freetype fontconfig
|
inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig
|
||||||
libxslt expat libdrm libpng zlib perl mesa mesaHeaders
|
libxslt expat libdrm libpng zlib perl mesa mesaHeaders
|
||||||
xkeyboard_config dbus hal libuuid openssl gperf m4;
|
xkeyboard_config dbus hal libuuid openssl gperf m4
|
||||||
|
automake autoconf libtool;
|
||||||
|
|
||||||
# !!! pythonBase is use instead of python because this cause an infinite
|
# !!! pythonBase is use instead of python because this cause an infinite
|
||||||
# !!! recursion when the flag python.full is set to true. Packages
|
# !!! recursion when the flag python.full is set to true. Packages
|
||||||
|
|
Loading…
Reference in a new issue