about summary refs log tree commit diff
path: root/pkgs/development/tools/misc/intel-gpu-tools
diff options
context:
space:
mode:
authorPascal Wittmann <mail@pascal-wittmann.de>2018-02-26 16:03:48 +0100
committerPascal Wittmann <mail@pascal-wittmann.de>2018-02-26 16:04:33 +0100
commit356296287d0a12ff1e1890135103cfd1aed89744 (patch)
tree834176340d59ef36cd0f788798279f3858e694ec /pkgs/development/tools/misc/intel-gpu-tools
parent7f400f4fb3e996b1b1729eb981444380b98393c7 (diff)
intel-gpu-tools: 1.19 -> 1.21
Diffstat (limited to 'pkgs/development/tools/misc/intel-gpu-tools')
-rw-r--r--pkgs/development/tools/misc/intel-gpu-tools/default.nix18
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index 9c131b72a316d..3d8b29e4ebc24 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -1,22 +1,28 @@
 { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev
 , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
-, procps, autoreconfHook, utilmacros }:
+, procps, autoreconfHook, utilmacros, gnome2 }:
 
 stdenv.mkDerivation rec {
-  name = "intel-gpu-tools-1.19";
+  name = "intel-gpu-tools-1.21";
 
   src = fetchurl {
-    url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2";
-    sha256 = "1wdhwf3im6ids95qw5r9hjj9hvp0qhzgi4llrlriy723q3kqm754";
+    url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.xz";
+    sha256 = "0gvh317dg5c7kvjxxkh8g70hh3r3dc73mc4dzyvfa8nb4ix6xbyr";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook utilmacros ];
+  nativeBuildInputs = [ pkgconfig utilmacros ];
   buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod
-    libXext libXv libXrandr glib bison libunwind python3 procps ];
+    libXext libXv libXrandr glib bison libunwind python3 procps
+    gnome2.gtkdoc ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
 
   preBuild = ''
     patchShebangs debugger/system_routine/pre_cpp.py
     substituteInPlace tools/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)'
+    substituteInPlace tests/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)'
   '';
 
   meta = with stdenv.lib; {