diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-07 19:33:52 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-07 19:33:52 +0100 |
commit | 674c51af3c0f3f1c65e1975893fdf6438bc57f28 (patch) | |
tree | 3020861cf515bc567e191361357d42e11ac817ee /pkgs/servers/x11 | |
parent | da437144fa4f446e91b5f7f78b55faa4d12de58a (diff) | |
parent | d742d26b0d8c7125fb29417fcb40e2665e10100d (diff) | |
download | nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar.gz nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar.bz2 nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar.lz nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar.xz nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.tar.zst nixlib-674c51af3c0f3f1c65e1975893fdf6438bc57f28.zip |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index f26ba257c024..3f8fc2e68a1f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1518,11 +1518,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.20.10"; + name = "xf86-video-intel-2.20.19"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.20.10.tar.bz2; - sha256 = "1kfd6qiqxyqhjp8g1xcipkldsf7xa47q8zfdhxg3qzw77n6a4hfz"; + 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 ;}; |