forked from mirrors/nixpkgs
Override xf86videoati version and make xkbcomp work from inside X server
svn path=/nixpkgs/trunk/; revision=15450
This commit is contained in:
parent
72b1cefae9
commit
4fb36441e2
|
@ -45,8 +45,16 @@
|
||||||
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
|
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
xf86videoati = attrs: attrs // {
|
||||||
|
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
|
||||||
|
src = args.fetchurl {
|
||||||
|
url = ftp://ftp.x.org/pub/individual/driver/xf86-video-ati-6.12.2.tar.bz2;
|
||||||
|
sha256 = "0l17mv7ljw9cnvfblms62vnjkpd26gf5dqgdpfzvkxqrfyhvpvhv";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
xkbcomp = attrs: attrs // {
|
xkbcomp = attrs: attrs // {
|
||||||
NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\"/etc/X11/xkb\"";
|
NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\".\"";
|
||||||
};
|
};
|
||||||
|
|
||||||
xorgserver = attrs: attrs // {
|
xorgserver = attrs: attrs // {
|
||||||
|
|
Loading…
Reference in a new issue