From 2e9e44300586c6b16c99d512b61b50e96e04b6f0 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 20 Sep 2018 09:43:56 +0100
Subject: [PATCH 1/2] glxinfo: 8.3.0 -> 8.4.0

---
 pkgs/tools/graphics/glxinfo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
index a3a9a4d8eda..7e4d95045a7 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "glxinfo-${version}";
-  version = "8.3.0";
+  version = "8.4.0";
 
   src = fetchurl {
-    url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2";
-    sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1";
+    url = "ftp://ftp.freedesktop.org/pub/mesa/demos/mesa-demos-${version}.tar.bz2";
+    sha256 = "0zgzbz55a14hz83gbmm0n9gpjnf5zadzi2kjjvkn6khql2a9rs81";
   };
 
   buildInputs = [ libX11 libGL ];

From e03b99c309565afe2fb090a1f5986e2c5fc95a5e Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 20 Sep 2018 10:46:42 +0100
Subject: [PATCH 2/2] glxinfo: add es2gears, es2_info

---
 pkgs/tools/graphics/glxinfo/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
index 7e4d95045a7..6a2a3a5a46e 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -14,14 +14,14 @@ stdenv.mkDerivation rec {
   configurePhase = "true";
 
   buildPhase = "
-    cd src/xdemos
-    $CC glxinfo.c glinfo_common.c -o glxinfo -lGL -lX11
-    $CC glxgears.c -o glxgears -lGL -lX11 -lm
+    $CC src/xdemos/{glxinfo.c,glinfo_common.c} -o glxinfo -lGL -lX11
+    $CC src/xdemos/glxgears.c -o glxgears -lGL -lX11 -lm
+    $CC src/egl/opengles2/es2_info.c -o es2_info -lEGL -lGLESv2 -lX11
+    $CC src/egl/opengles2/es2gears.c src/egl/eglut/{eglut.c,eglut_x11.c} -o es2gears -Isrc/egl/eglut -lEGL -lGLESv2 -lX11 -lm
   ";
 
   installPhase = "
-    mkdir -p $out/bin
-    cp glxinfo glxgears $out/bin/
+    install -Dm 555 -t $out/bin glx{info,gears} es2{_info,gears}
   ";
 
   meta = with stdenv.lib; {