diff options
| author | Mikael Brockman <mikael@brockman.se> | 2017-04-15 12:32:46 +0300 |
|---|---|---|
| committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-04-15 11:32:46 +0200 |
| commit | 4f3caee682c878d7b53d1b19b914efa0aab0a60d (patch) | |
| tree | f5e4884cc5a7f0b4d1ea69d0a0147447f50c247d /pkgs/development/tools/misc/intel-gpu-tools | |
| parent | b454dcd0e0f6ce98a97114e1b7d2da13abad644d (diff) | |
| download | nixpkgs-4f3caee682c878d7b53d1b19b914efa0aab0a60d.tar nixpkgs-4f3caee682c878d7b53d1b19b914efa0aab0a60d.tar.gz nixpkgs-4f3caee682c878d7b53d1b19b914efa0aab0a60d.tar.bz2 nixpkgs-4f3caee682c878d7b53d1b19b914efa0aab0a60d.tar.lz nixpkgs-4f3caee682c878d7b53d1b19b914efa0aab0a60d.tar.xz nixpkgs-4f3caee682c878d7b53d1b19b914efa0aab0a60d.tar.zst nixpkgs-4f3caee682c878d7b53d1b19b914efa0aab0a60d.zip | |
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`.
Diffstat (limited to 'pkgs/development/tools/misc/intel-gpu-tools')
| -rw-r--r-- | pkgs/development/tools/misc/intel-gpu-tools/default.nix | 9 |
1 files 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; { |