diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 62d350593b16..eca59819ba09 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,37 +1,85 @@ -{ lib, stdenv, fetchurl, pkg-config, libdrm, libpciaccess, cairo, xorgproto, udev -, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod -, procps, utilmacros, gtk-doc, openssl, peg, elfutils +{ lib +, stdenv +, fetchurl +, pkg-config +, libdrm +, libpciaccess +, cairo +, xorgproto +, udev +, libX11 +, libXext +, libXv +, libXrandr +, glib +, bison +, libunwind +, python3 +, kmod +, procps +, utilmacros +, gtk-doc +, docbook_xsl +, openssl +, peg +, elfutils +, meson +, ninja +, valgrind +, xmlrpc_c +, gsl +, alsa-lib +, curl +, json_c +, liboping +, flex +, docutils }: stdenv.mkDerivation rec { pname = "intel-gpu-tools"; - version = "1.25"; + version = "1.26"; src = fetchurl { url = "https://xorg.freedesktop.org/archive/individual/app/igt-gpu-tools-${version}.tar.xz"; - sha256 = "04fx7xclhick3k7fyk9c4mn8mxzf1253j1r0hrvj9sl40j7lsia0"; + sha256 = "1dwvxh1yplsh1a7h3gpp40g91v12cfxy6yy99s1v9yr2kwxikm1n"; }; - nativeBuildInputs = [ pkg-config utilmacros ]; - buildInputs = [ libdrm libpciaccess cairo xorgproto udev libX11 kmod - libXext libXv libXrandr glib bison libunwind python3 procps - gtk-doc openssl peg elfutils ]; + nativeBuildInputs = [ pkg-config utilmacros meson ninja flex bison gtk-doc docutils docbook_xsl ]; + buildInputs = [ + libdrm + libpciaccess + cairo + xorgproto + udev + libX11 + kmod + libXext + libXv + libXrandr + glib + libunwind + python3 + procps + openssl + peg + elfutils + valgrind + xmlrpc_c + gsl + alsa-lib + curl + json_c + liboping + ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=array-bounds" ]; preConfigure = '' - ./autogen.sh + patchShebangs tests man ''; - preBuild = '' - patchShebangs tests - - 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)' - ''; - - enableParallelBuilding = true; + hardeningDisable = [ "bindnow" ]; meta = with lib; { homepage = "https://01.org/linuxgraphics/";