From 4f3caee682c878d7b53d1b19b914efa0aab0a60d Mon Sep 17 00:00:00 2001 From: Mikael Brockman Date: Sat, 15 Apr 2017 12:32:46 +0300 Subject: [PATCH] intel-gpu-tools: 1.17 -> 1.18 (#24920) Version 1.17 fails to build with the current libdrm because of a changed struct (`drm_event_vblank`). I had to patch `tools/Makefile.am` to use `GLIB_CFLAGS`; otherwise, the build failed to find `glib.h`. --- pkgs/development/tools/misc/intel-gpu-tools/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index e7520091d1d..f644160b9a3 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod -, procps }: +, procps, autoconf, automake }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.17"; + name = "intel-gpu-tools-1.18"; src = fetchurl { url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "06pvmbsbff4bsi67n6x3jjngzy2llf8bplc75447ra1fwphc9jx6"; + sha256 = "1vp4czxp8xa6qk4pg3mrxhc2yadw2rv6p8r8247mkpcbb8dzjxyz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf automake ]; buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod libXext libXv libXrandr glib bison libunwind python3 procps ]; preBuild = '' patchShebangs debugger/system_routine/pre_cpp.py + substituteInPlace tools/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)' ''; meta = with stdenv.lib; {