kookie
/
nomicon
1
0
Fork 0
Code Issues Projects Releases 1 Activity

xorg: update xorgserver to 1.13.4, and more

Browse Source 
- update some modules to work with the newer server
- fix many other modules via overrides
- huge cleanup in overrides via better propagation
  and pixman include flattening
- URLs of XCB stuff have been moved
wip/yesman
Vladimír Čunát 11 years ago
parent 7716b78fc7
commit c859a46712
6 changed files with 175 additions and 289 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 248
      pkgs/servers/x11/xorg/default.nix
  2. 15
      pkgs/servers/x11/xorg/extra.list
  3. 4
      pkgs/servers/x11/xorg/old.list
  4. 134
      pkgs/servers/x11/xorg/overrides.nix
  5. 61
      pkgs/servers/x11/xorg/tarballs-7.7.list
  6. 2
      pkgs/top-level/all-packages.nix

248
pkgs/servers/x11/xorg/default.nix
Unescape View File

@ -883,7 +883,7 @@ let
name = "libpthread-stubs-0.3";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/libpthread-stubs-0.3.tar.bz2;
url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2;
sha256 = "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim";
};
buildInputs = [pkgconfig ];
@ -893,7 +893,7 @@ let
name = "libxcb-1.9";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xcb/libxcb-1.9.tar.bz2;
url = http://xcb.freedesktop.org/dist/libxcb-1.9.tar.bz2;
sha256 = "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8";
};
buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
@ -959,16 +959,6 @@ let
buildInputs = [pkgconfig libfontenc freetype xproto zlib ];
})) // {inherit libfontenc freetype xproto zlib ;};
pixman = (stdenv.mkDerivation ((if overrides ? pixman then overrides.pixman else x: x) {
name = "pixman-0.26.2";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/pixman-0.26.2.tar.bz2;
sha256 = "0z34jb75wpbyj3gxn34icd8j81fk5d6s6qnwp2ncz7m8icf6afqr";
};
buildInputs = [pkgconfig libpng perl ];
})) // {inherit libpng perl ;};
printproto = (stdenv.mkDerivation ((if overrides ? printproto then overrides.printproto else x: x) {
name = "printproto-1.0.5";
builder = ./builder.sh;
@ -1143,7 +1133,7 @@ let
name = "xcb-proto-1.8";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xcb/xcb-proto-1.8.tar.bz2;
url = http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2;
sha256 = "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93";
};
buildInputs = [pkgconfig python ];
@ -1153,7 +1143,7 @@ let
name = "xcb-util-0.3.9";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xcb/xcb-util-0.3.9.tar.bz2;
url = http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2;
sha256 = "1i0qbhqkcdlbbsj7ifkyjsffl61whj24d3zlg5pxf3xj1af2a4f6";
};
buildInputs = [pkgconfig gperf m4 libxcb xproto ];
@ -1163,7 +1153,7 @@ let
name = "xcb-util-image-0.3.9";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xcb/xcb-util-image-0.3.9.tar.bz2;
url = http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2;
sha256 = "1pr1l1nkg197gyl9d0fpwmn72jqpxjfgn9y13q4gawg1m873qnnk";
};
buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ];
@ -1173,7 +1163,7 @@ let
name = "xcb-util-keysyms-0.3.9";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.9.tar.bz2;
url = http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2;
sha256 = "0vjwk7vrcfnlhiadv445c6skfxmdrg5v4qf81y8s2s5xagqarqbv";
};
buildInputs = [pkgconfig gperf m4 libxcb xproto ];
@ -1183,7 +1173,7 @@ let
name = "xcb-util-renderutil-0.3.8";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2;
url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2;
sha256 = "0lkl9ij9b447c0br2qc5qsynjn09c4fdz7sd6yp7pyi8az2sb2cp";
};
buildInputs = [pkgconfig gperf m4 libxcb xproto ];
@ -1193,7 +1183,7 @@ let
name = "xcb-util-wm-0.3.9";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xcb/xcb-util-wm-0.3.9.tar.bz2;
url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.3.9.tar.bz2;
sha256 = "0c30fj33gvwzwhyz1dhsfwni0ai16bxpvxb4l6c6s7vvj7drp3q3";
};
buildInputs = [pkgconfig gperf m4 libxcb xproto ];
@ -1350,11 +1340,11 @@ let
})) // {inherit inputproto udev xorgserver xproto ;};
xf86inputjoystick = (stdenv.mkDerivation ((if overrides ? xf86inputjoystick then overrides.xf86inputjoystick else x: x) {
name = "xf86-input-joystick-1.6.1";
name = "xf86-input-joystick-1.6.2";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-1.6.1.tar.bz2;
sha256 = "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x";
url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2;
sha256 = "038mfqairyyqvz02rk7v3i070sab1wr0k6fkxvyvxdgkfbnqcfzf";
};
buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ];
})) // {inherit inputproto kbproto xorgserver xproto ;};
@ -1390,11 +1380,11 @@ let
})) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
xf86inputvmmouse = (stdenv.mkDerivation ((if overrides ? xf86inputvmmouse then overrides.xf86inputvmmouse else x: x) {
name = "xf86-input-vmmouse-12.9.0";
name = "xf86-input-vmmouse-13.0.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-input-vmmouse-12.9.0.tar.bz2;
sha256 = "1gwrna96f0p4gpjhin8yx01y5xvns2j15f7hw1jvqf7fpzv01kzv";
url = mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2;
sha256 = "0b31ap9wp7nwpnihz8m7bz3p0hhaipxxhl652nw4v380cq1vdkq4";
};
buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
})) // {inherit inputproto randrproto xorgserver xproto ;};
@ -1403,7 +1393,7 @@ let
name = "xf86-input-void-1.4.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-input-void-1.4.0.tar.bz2;
url = mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2;
sha256 = "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a";
};
buildInputs = [pkgconfig xorgserver xproto ];
@ -1420,31 +1410,31 @@ let
})) // {inherit ;};
xf86videoark = (stdenv.mkDerivation ((if overrides ? xf86videoark then overrides.xf86videoark else x: x) {
name = "xf86-video-ark-0.7.4";
name = "xf86-video-ark-0.7.5";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-ark-0.7.4.tar.bz2;
sha256 = "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x";
url = mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2;
sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
buildInputs = [pkgconfig fontsproto libpciaccess xextproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;};
xf86videoast = (stdenv.mkDerivation ((if overrides ? xf86videoast then overrides.xf86videoast else x: x) {
name = "xf86-video-ast-0.93.10";
name = "xf86-video-ast-0.97.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-ast-0.93.10.tar.bz2;
sha256 = "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69";
url = mirror://xorg/individual/driver/xf86-video-ast-0.97.0.tar.bz2;
sha256 = "0xlfk64pa0vbg74m261fw8cn4vw6jw3nxm6wys9m4j3n2rwd9z18";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) {
name = "xf86-video-ati-6.14.4";
name = "xf86-video-ati-7.1.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-ati-6.14.4.tar.bz2;
sha256 = "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg";
url = mirror://xorg/individual/driver/xf86-video-ati-7.1.0.tar.bz2;
sha256 = "1k8hwszx1zj17z0657dna8q4k7x67adc163z44jiccyb3w2l9bn8";
};
buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
})) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
@ -1460,11 +1450,11 @@ let
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videodummy = (stdenv.mkDerivation ((if overrides ? xf86videodummy then overrides.xf86videodummy else x: x) {
name = "xf86-video-dummy-0.3.5";
name = "xf86-video-dummy-0.3.6";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-0.3.5.tar.bz2;
sha256 = "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm";
url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.6.tar.bz2;
sha256 = "16773lxa74d9v2x758bx0byrmxssplqygnjn09q3klr605j5ncs4";
};
buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
})) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
@ -1480,41 +1470,41 @@ let
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
xf86videogeode = (stdenv.mkDerivation ((if overrides ? xf86videogeode then overrides.xf86videogeode else x: x) {
name = "xf86-video-geode-2.11.13";
name = "xf86-video-geode-2.11.14";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-geode-2.11.13.tar.bz2;
sha256 = "09p2cjd2fb7h32k9qs4wp7qvhfn2zv454spv5mfplv7w2jis4863";
url = mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2;
sha256 = "1k6gl1kq2fr0gj6sqrg2rypp59f8b8pr46c902m4z4rjr530nxac";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videoglide = (stdenv.mkDerivation ((if overrides ? xf86videoglide then overrides.xf86videoglide else x: x) {
name = "xf86-video-glide-1.2.0";
name = "xf86-video-glide-1.2.1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-glide-1.2.0.tar.bz2;
sha256 = "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l";
url = mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2;
sha256 = "0vp9izdy7lgx09jfwr4ra9zvrx1hg15a5v2nhx00v31ffkh2aiyp";
};
buildInputs = [pkgconfig xextproto xorgserver xproto ];
})) // {inherit xextproto xorgserver xproto ;};
xf86videoglint = (stdenv.mkDerivation ((if overrides ? xf86videoglint then overrides.xf86videoglint else x: x) {
name = "xf86-video-glint-1.2.7";
name = "xf86-video-glint-1.2.8";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-glint-1.2.7.tar.bz2;
sha256 = "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs";
url = mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2;
sha256 = "08a2aark2yn9irws9c78d9q44dichr03i9zbk61jgr54ncxqhzv5";
};
buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ];
})) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;};
xf86videoi128 = (stdenv.mkDerivation ((if overrides ? xf86videoi128 then overrides.xf86videoi128 else x: x) {
name = "xf86-video-i128-1.3.5";
name = "xf86-video-i128-1.3.6";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-i128-1.3.5.tar.bz2;
sha256 = "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y";
url = mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2;
sha256 = "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
@ -1526,55 +1516,35 @@ let
url = mirror://xorg/individual/driver/xf86-video-intel-2.20.19.tar.bz2;
sha256 = "0k67vcf0aqhv9zmy1arxyjdl7fsrg90cjm0ryyhamghq67z0xcmr";
};
buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ];
})) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;};
xf86videointel_2_14_901 = (stdenv.mkDerivation ((if overrides ? xf86videointel_2_14_901 then overrides.xf86videointel_2_14_901 else x: x) {
name = "xf86-video-intel-2.14.901";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2;
sha256 = "1hm3zn96ahmirvx1iv87sk7fl7g8a6h1j7560gyw7y5b3l1zmg5r";
};
buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ];
})) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;};
xf86videointel_2_17_0 = (stdenv.mkDerivation ((if overrides ? xf86videointel_2_17_0 then overrides.xf86videointel_2_17_0 else x: x) {
name = "xf86-video-intel-2.17.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2;
sha256 = "11s3vjp0lrfmb4bv848fd5bajj77j3rf451lm0qyylnclbr5114b";
};
buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ];
})) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;};
buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ];
})) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;};
xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) {
name = "xf86-video-mach64-6.9.1";
name = "xf86-video-mach64-6.9.4";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-6.9.1.tar.bz2;
sha256 = "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz";
url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2;
sha256 = "0pl582vnc6hdxqhf5c0qdyanjqxb4crnhqlmxxml5a60syw0iwcp";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
xf86videomga = (stdenv.mkDerivation ((if overrides ? xf86videomga then overrides.xf86videomga else x: x) {
name = "xf86-video-mga-1.5.0";
name = "xf86-video-mga-1.6.2";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-mga-1.5.0.tar.bz2;
sha256 = "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a";
url = mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2;
sha256 = "0v6agqc9lxg8jgrksc1yksmhnv70j1vnhm09i7gg14za1qjwx29z";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
xf86videoneomagic = (stdenv.mkDerivation ((if overrides ? xf86videoneomagic then overrides.xf86videoneomagic else x: x) {
name = "xf86-video-neomagic-1.2.6";
name = "xf86-video-neomagic-1.2.7";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-1.2.6.tar.bz2;
sha256 = "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi";
url = mirror://xorg/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2;
sha256 = "0xnbk2y5pzs1g3w2rmjc4k3nyq6kazf67bv4q3dnbywalsgfh1lz";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
@ -1600,101 +1570,101 @@ let
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videoopenchrome = (stdenv.mkDerivation ((if overrides ? xf86videoopenchrome then overrides.xf86videoopenchrome else x: x) {
name = "xf86-video-openchrome-0.2.906";
name = "xf86-video-openchrome-0.3.2";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-0.2.906.tar.bz2;
sha256 = "0hgzn1r7ig94xbr9dvq0bp1nxqlfp2ki8823jca3f22a2kf8wmg7";
url = mirror://xorg/individual/driver/xf86-video-openchrome-0.3.2.tar.bz2;
sha256 = "11pm8h9qxdjxn5rwz433cbnp6v0gg62b61nl20gxvghb7rgwv70m";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ];
})) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
xf86videor128 = (stdenv.mkDerivation ((if overrides ? xf86videor128 then overrides.xf86videor128 else x: x) {
name = "xf86-video-r128-6.8.2";
name = "xf86-video-r128-6.9.1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-r128-6.8.2.tar.bz2;
sha256 = "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv";
url = mirror://xorg/individual/driver/xf86-video-r128-6.9.1.tar.bz2;
sha256 = "0k746kk75h3hg3wmihqlmp14s52fg0svylqay02km7misflbmqwb";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
xf86videosavage = (stdenv.mkDerivation ((if overrides ? xf86videosavage then overrides.xf86videosavage else x: x) {
name = "xf86-video-savage-2.3.4";
name = "xf86-video-savage-2.3.6";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-savage-2.3.4.tar.bz2;
sha256 = "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris";
url = mirror://xorg/individual/driver/xf86-video-savage-2.3.6.tar.bz2;
sha256 = "1mk3mpwl97clxhwzl990hj31z8qfh7fd4vs6qbl5i250ykc3x0a8";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
xf86videosiliconmotion = (stdenv.mkDerivation ((if overrides ? xf86videosiliconmotion then overrides.xf86videosiliconmotion else x: x) {
name = "xf86-video-siliconmotion-1.7.6";
name = "xf86-video-siliconmotion-1.7.7";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-1.7.6.tar.bz2;
sha256 = "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5";
url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2;
sha256 = "1an321kqvsxq0z35acwl99lc8hpdkayw0q180744ypcl8ffvbf47";
};
buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;};
xf86videosis = (stdenv.mkDerivation ((if overrides ? xf86videosis then overrides.xf86videosis else x: x) {
name = "xf86-video-sis-0.10.4";
name = "xf86-video-sis-0.10.7";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-sis-0.10.4.tar.bz2;
sha256 = "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f";
url = mirror://xorg/individual/driver/xf86-video-sis-0.10.7.tar.bz2;
sha256 = "1l0w84x39gq4y9j81dny9r6rma1xkqvxpsavpkd8h7h8panbcbmy";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;};
xf86videosuncg6 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg6 then overrides.xf86videosuncg6 else x: x) {
name = "xf86-video-suncg6-1.1.1";
name = "xf86-video-suncg6-1.1.2";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-1.1.1.tar.bz2;
sha256 = "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi";
url = mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2;
sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr";
};
buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
})) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
xf86videosunffb = (stdenv.mkDerivation ((if overrides ? xf86videosunffb then overrides.xf86videosunffb else x: x) {
name = "xf86-video-sunffb-1.2.1";
name = "xf86-video-sunffb-1.2.2";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-1.2.1.tar.bz2;
sha256 = "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx";
url = mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2;
sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s";
};
buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
})) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
xf86videotdfx = (stdenv.mkDerivation ((if overrides ? xf86videotdfx then overrides.xf86videotdfx else x: x) {
name = "xf86-video-tdfx-1.4.4";
name = "xf86-video-tdfx-1.4.5";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-1.4.4.tar.bz2;
sha256 = "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0";
url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.5.tar.bz2;
sha256 = "0nfqf1c8939s21ci1g7gacwzlr4g4nnilahgz7j2bz30zfnzpmbh";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
xf86videotga = (stdenv.mkDerivation ((if overrides ? xf86videotga then overrides.xf86videotga else x: x) {
name = "xf86-video-tga-1.2.1";
name = "xf86-video-tga-1.2.2";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-tga-1.2.1.tar.bz2;
sha256 = "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h";
url = mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2;
sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
xf86videotrident = (stdenv.mkDerivation ((if overrides ? xf86videotrident then overrides.xf86videotrident else x: x) {
name = "xf86-video-trident-1.3.5";
name = "xf86-video-trident-1.3.6";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-trident-1.3.5.tar.bz2;
sha256 = "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb";
url = mirror://xorg/individual/driver/xf86-video-trident-1.3.6.tar.bz2;
sha256 = "0141qbfsm32i0pxjyx5czpa8x8m4lvapsp4amw1qigaa0gry6n3a";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
@ -1720,21 +1690,21 @@ let
})) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
xf86videovmware = (stdenv.mkDerivation ((if overrides ? xf86videovmware then overrides.xf86videovmware else x: x) {
name = "xf86-video-vmware-12.0.2";
name = "xf86-video-vmware-13.0.1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2;
sha256 = "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8";
url = mirror://xorg/individual/driver/xf86-video-vmware-13.0.1.tar.bz2;
sha256 = "0ggyz3yl1ly0p9c9lva5z3892vm033z49py3svd2wh92bi0xlbc0";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) {
name = "xf86-video-voodoo-1.2.4";
name = "xf86-video-voodoo-1.2.5";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-1.2.4.tar.bz2;
sha256 = "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph";
url = mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2;
sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
@ -1760,11 +1730,11 @@ let
})) // {inherit ;};
xfs = (stdenv.mkDerivation ((if overrides ? xfs then overrides.xfs else x: x) {
name = "xfs-1.1.2";
name = "xfs-1.1.3";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/app/xfs-1.1.2.tar.bz2;
sha256 = "17g34yq789grnic83cqj5khq0knda1w2rgabhjflsyw9wg663shd";
url = mirror://xorg/individual/app/xfs-1.1.3.tar.bz2;
sha256 = "1dwnf5gncpnjsbh9bdrc665kfnclhzzcpwpfnprvrnq4mlr4mx3v";
};
buildInputs = [pkgconfig libXfont xproto xtrans ];
})) // {inherit libXfont xproto xtrans ;};
@ -1850,14 +1820,14 @@ let
})) // {inherit inputproto libX11 libXaw xproto libXt ;};
xkeyboardconfig = (stdenv.mkDerivation ((if overrides ? xkeyboardconfig then overrides.xkeyboardconfig else x: x) {
name = "xkeyboard-config-2.6";
name = "xkeyboard-config-2.8";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xkeyboard-config-2.6.tar.bz2;
sha256 = "1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892";
url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2;
sha256 = "1bkq415qw4r3dl139mqgal9v585x7kh3km6z1lraz2j8im3ga72f";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
buildInputs = [pkgconfig libX11 xproto ];
})) // {inherit libX11 xproto ;};
xkill = (stdenv.mkDerivation ((if overrides ? xkill then overrides.xkill else x: x) {
name = "xkill-1.0.3";
@ -1890,11 +1860,11 @@ let
})) // {inherit libxcb ;};
xmessage = (stdenv.mkDerivation ((if overrides ? xmessage then overrides.xmessage else x: x) {
name = "xmessage-1.0.3";
name = "xmessage-1.0.4";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/app/xmessage-1.0.3.tar.bz2;
sha256 = "0nrxidff0pcd1ampfzj91ai74j6mx613j5kqk3j0c4xdshx5v8yg";
url = mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2;
sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw";
};
buildInputs = [pkgconfig libXaw libXt ];
})) // {inherit libXaw libXt ;};
@ -1930,24 +1900,14 @@ let
})) // {inherit ;};
xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
name = "xorg-server-1.12.4";
name = "xorg-server-1.13.4";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xserver/xorg-server-1.12.4.tar.bz2;
sha256 = "1xscr6rf0q15hv3hmm51xhwk0c0rx7a2swkj14ygp8vb60sprh4a";
url = mirror://xorg/individual/xserver/xorg-server-1.13.4.tar.bz2;
sha256 = "1kwq5hqgl3qmm4nxh5iwpa0wwwzsj67fxqiiglzhyyrwgy46kjd2";
};
buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
})) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
xorgserver_1_13_0 = (stdenv.mkDerivation ((if overrides ? xorgserver_1_13_0 then overrides.xorgserver_1_13_0 else x: x) {
name = "xorg-server-1.13.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2;
sha256 = "12pjis236ss3402cg1iy749cylajjp27m3j2jbwd8yh8075r32sl";
};
buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv pixman glproto ];
})) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv pixman glproto ;};
xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) {
name = "xorg-sgml-doctools-1.11";

15
pkgs/servers/x11/xorg/extra.list
Unescape View File

@ -1,7 +1,8 @@
mirror://xorg/individual/lib/pixman-0.26.2.tar.bz2
mirror://xorg/individual/xcb/xcb-util-0.3.9.tar.bz2
mirror://xorg/individual/xcb/xcb-util-image-0.3.9.tar.bz2
mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.9.tar.bz2
mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2
mirror://xorg/individual/xcb/xcb-util-wm-0.3.9.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2:xorgserver_1_13_0
http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
http://xcb.freedesktop.org/dist/libxcb-1.9.tar.bz2
http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-wm-0.3.9.tar.bz2

4
pkgs/servers/x11/xorg/old.list
Unescape View File

@ -2,9 +2,9 @@ mirror://xorg/individual/app/twm-1.0.7.tar.bz2
mirror://xorg/individual/app/xclock-1.0.6.tar.bz2
mirror://xorg/individual/app/xdm-1.1.11.tar.bz2
mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2
mirror://xorg/individual/app/xfs-1.1.2.tar.bz2
mirror://xorg/individual/app/xfs-1.1.3.tar.bz2
mirror://xorg/individual/app/xinit-1.3.2.tar.bz2
mirror://xorg/individual/app/xmessage-1.0.3.tar.bz2
mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2
mirror://xorg/individual/lib/libXp-1.0.1.tar.bz2
mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2
mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2

134
pkgs/servers/x11/xorg/overrides.nix
Unescape View File

@ -7,6 +7,9 @@ let
'';
in
{
encodings = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ];
};
fontcursormisc = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ];
@ -46,11 +49,6 @@ in
nativeBuildInputs = [ args.python ];
};
pixman = attrs : attrs // {
buildInputs = [ args.pkgconfig ];
nativeBuildInputs = [ args.perl ];
};
libpciaccess = attrs : attrs // {
patches = [ ./libpciaccess-apple.patch ];
};
@ -132,83 +130,28 @@ in
xf86inputevdev = attrs: attrs // {
preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto xorg.pixman];
installFlags = "sdkdir=\${out}/include/xorg";
};
xf86inputkeyboard = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.pixman];
};
xf86inputmouse = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.pixman];
xf86inputjoystick = attrs: attrs // {
installFlags = "sdkdir=\${out}/include/xorg";
};
xf86inputsynaptics = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [args.mtdev xorg.pixman];
buildInputs = attrs.buildInputs ++ [args.mtdev];
installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/include/xorg";
};
xf86inputvoid = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.pixman];
};
xf86videointel = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
};
xf86videosis = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
};
xf86videoati = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa xorg.pixman];
};
xf86videocirrus = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.pixman];
};
xf86videodummy = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.pixman];
};
xf86videofbdev = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.pixman];
};
xf86videoopenchrome = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.pixman xorg.glproto args.mesa];
};
xf86videonv = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.pixman];
};
xf86videovesa = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.pixman];
};
xf86videovmware = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.pixman xorg.glproto args.mesa];
xf86inputvmmouse = attrs: attrs // {
configureFlags = [
"--sysconfdir=$(out)/etc"
"--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d"
"--with-udev-rules-dir=$(out)/lib/udev/rules.d"
];
};
xdriinfo = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
buildInputs = attrs.buildInputs ++ [args.mesa];
};
xvinfo = attrs: attrs // {
@ -219,44 +162,24 @@ in
NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\".\"";
};
xorgserver = attrs: attrs // {
configureFlags = "--enable-xcsecurity"; # enable SECURITY extension
patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch];
buildInputs = attrs.buildInputs ++
[ args.zlib args.udev args.mesa args.dbus.libs
xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto
xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto
xorg.xineramaproto xorg.xf86dgaproto
xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto
xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont
xorg.damageproto xorg.xcmiscproto xorg.xtrans xorg.bigreqsproto
];
propagatedBuildInputs =
[ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto
xorg.dri2proto xorg.kbproto
];
postInstall =
''
rm -fr $out/share/X11/xkb/compiled
ln -s /var/tmp $out/share/X11/xkb/compiled
'';
xkeyboardconfig = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [args.intltool];
};
xorgserver_1_13_0 = attrs: attrs // {
xorgserver = with xorg; attrs: attrs // {
configureFlags = "--enable-xcsecurity"; # enable SECURITY extension
patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch];
buildInputs = attrs.buildInputs ++
[ args.zlib args.udev args.mesa args.dbus.libs
xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto
xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto
xorg.xineramaproto xorg.xf86dgaproto
xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto
xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont
xorg.damageproto xorg.xcmiscproto xorg.xtrans xorg.bigreqsproto
];
buildInputs = attrs.buildInputs ++ [ xtrans ];
propagatedBuildInputs =
[ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto
xorg.dri2proto xorg.kbproto
[ args.zlib args.udev args.mesa args.dbus.libs
xf86bigfontproto glproto xf86driproto
compositeproto scrnsaverproto resourceproto
xf86dgaproto
dmxproto /*libdmx not used*/ xf86vidmodeproto
recordproto libXext pixman libXfont
damageproto xcmiscproto bigreqsproto
libpciaccess inputproto xextproto randrproto renderproto
dri2proto kbproto xineramaproto resourceproto scrnsaverproto videoproto
];
postInstall =
''
@ -283,6 +206,11 @@ in
buildInputs = attrs.buildInputs ++ [xorg.libXrender];
};
xcursorthemes = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [xorg.xcursorgen];
configureFlags = "--with-cursordir=$(out)/share/icons";
};
xinput = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [xorg.libXrender];
};

61
pkgs/servers/x11/xorg/tarballs-7.7.list
Unescape View File

@ -54,13 +54,11 @@ mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/libFS-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2
mirror://xorg/X11R7.7/src/everything/libpciaccess-0.13.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/libpthread-stubs-0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/libSM-1.2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/libX11-1.5.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXau-1.0.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXaw-1.0.11.tar.bz2
mirror://xorg/individual/xcb/libxcb-1.9.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2
@ -103,7 +101,6 @@ mirror://xorg/X11R7.7/src/everything/x11perf-1.5.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xauth-1.0.7.tar.bz2
mirror://xorg/individual/app/xbacklight-1.2.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2
mirror://xorg/individual/xcb/xcb-proto-1.8.tar.bz2
mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2
@ -116,42 +113,42 @@ mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-evdev-2.7.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-1.6.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.6.2.tar.bz2
mirror://xorg/individual/driver/xf86-input-vmmouse-12.9.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-input-void-1.4.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-ark-0.7.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-ast-0.93.10.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-6.14.4.tar.bz2
mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ast-0.97.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-7.1.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-cirrus-1.5.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-0.3.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-dummy-0.3.6.tar.bz2
mirror://xorg/individual/driver/xf86-video-fbdev-0.4.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-geode-2.11.13.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-glide-1.2.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-glint-1.2.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-i128-1.3.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-intel-2.20.10.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-6.9.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-mga-1.5.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-1.2.6.tar.bz2
mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2
mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2
mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2
mirror://xorg/individual/driver/xf86-video-intel-2.20.19.tar.bz2
mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2
mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2
mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-0.2.906.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-r128-6.8.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-savage-2.3.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-1.7.6.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-sis-0.10.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-1.1.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-1.2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-1.4.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-tga-1.2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-trident-1.3.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-openchrome-0.3.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-r128-6.9.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-savage-2.3.6.tar.bz2
mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-sis-0.10.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-tdfx-1.4.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-trident-1.3.6.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vesa-2.3.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-1.2.4.tar.bz2
mirror://xorg/individual/driver/xf86-video-vmware-13.0.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xgamma-1.0.5.tar.bz2
@ -161,13 +158,13 @@ mirror://xorg/X11R7.7/src/everything/xinput-1.6.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/xkbutils-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/xkeyboard-config-2.6.tar.bz2
mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2
mirror://xorg/X11R7.7/src/everything/xkill-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.12.4.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.13.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xprop-1.2.1.tar.bz2

2
pkgs/top-level/all-packages.nix
Unescape View File

@ -5664,7 +5664,7 @@ let
xinetd = callPackage ../servers/xinetd { };
xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig
inherit fetchurl fetchsvn stdenv pkgconfig intltool freetype fontconfig
libxslt expat libdrm libpng zlib perl mesa
xkeyboard_config dbus libuuid openssl gperf m4
autoconf libtool xmlto asciidoc udev flex bison python mtdev;

Write Preview
Loading…
Cancel
Save