public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel-gpu-tools: 1.17 -> 1.18 (#24920)

Browse Source 
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`.
This commit is contained in:
Mikael Brockman 2017-04-15 12:32:46 +03:00 committed by Jörg Thalheim
parent b454dcd0e0
commit 4f3caee682
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/tools/misc/intel-gpu-tools/default.nix
View File

@ -1,21 +1,22 @@
{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev
, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
, procps }: , procps, autoconf, automake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "intel-gpu-tools-1.17"; name = "intel-gpu-tools-1.18";
src = fetchurl { src = fetchurl {
url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; 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 buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod
libXext libXv libXrandr glib bison libunwind python3 procps ]; libXext libXv libXrandr glib bison libunwind python3 procps ];
preBuild = '' preBuild = ''
patchShebangs debugger/system_routine/pre_cpp.py patchShebangs debugger/system_routine/pre_cpp.py
substituteInPlace tools/Makefile.am --replace '$(CAIRO_CFLAGS)' '$(CAIRO_CFLAGS) $(GLIB_CFLAGS)'
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {