about summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-09-18 22:19:47 +0200
committerVladimír Čunát <vcunat@gmail.com>2016-09-18 22:19:47 +0200
commit73f59a794db4b4a4cf93a92fa5244400b73745ba (patch)
tree2b377961b6ae3bcaedd9f3ac25e0b06341233320 /pkgs/servers
parentdbc40d3fdc707c78ea9a9d9422132316a7d5eff8 (diff)
parentc640fbfdc3ec7894fb232ba54aa0b4d2e5f8029b (diff)
downloadnixlib-73f59a794db4b4a4cf93a92fa5244400b73745ba.tar
nixlib-73f59a794db4b4a4cf93a92fa5244400b73745ba.tar.gz
nixlib-73f59a794db4b4a4cf93a92fa5244400b73745ba.tar.bz2
nixlib-73f59a794db4b4a4cf93a92fa5244400b73745ba.tar.lz
nixlib-73f59a794db4b4a4cf93a92fa5244400b73745ba.tar.xz
nixlib-73f59a794db4b4a4cf93a92fa5244400b73745ba.tar.zst
nixlib-73f59a794db4b4a4cf93a92fa5244400b73745ba.zip
Merge #18717: xf86-video-intel: update and use DRI3
... by default
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/x11/xorg/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 6cdca83256d9..6cab8597869e 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1824,14 +1824,15 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videointel = (mkDerivation "xf86videointel" {
-    name = "xf86-video-intel-2016-05-22";
+    name = "xf86-video-intel-2016-09-08";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/8477615ae1bd284aca1221185ffefe0630d3f7ab.tar.gz;
-      sha256 = "1fnwcsg2kr32nv9x6z671g6amwcyhba2392d63kjl2avjyhjad79";
+      url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/15c5ff12459a034b552c787047d1af6d61047cd6.tar.gz;
+      sha256 = "0nggdll6i5qddv9r2imip4hf6aw1nmfxjqg3i6gcbwmqp2w3f003";
     };
     buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ];
     meta.platforms = stdenv.lib.platforms.unix;
+    configureFlags = "--with-default-dri=3";
   }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;};
 
   xf86videomach64 = (mkDerivation "xf86videomach64" {