diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-26 22:55:11 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-26 22:55:11 +0100 |
| commit | 6168c2e45f7dc17a237e4752eb4ee1dbb56f6a56 (patch) | |
| tree | d6d622661e222045811f5bb26d441bb1fd7752f7 /pkgs/development/tools | |
| parent | b92d9945015d40a76a6ce5a84ef0e49098f15faa (diff) | |
| parent | e2243a5ac95826b5b8c23c77c3562d81e5146b29 (diff) | |
| download | nixlib-6168c2e45f7dc17a237e4752eb4ee1dbb56f6a56.tar nixlib-6168c2e45f7dc17a237e4752eb4ee1dbb56f6a56.tar.gz nixlib-6168c2e45f7dc17a237e4752eb4ee1dbb56f6a56.tar.bz2 nixlib-6168c2e45f7dc17a237e4752eb4ee1dbb56f6a56.tar.lz nixlib-6168c2e45f7dc17a237e4752eb4ee1dbb56f6a56.tar.xz nixlib-6168c2e45f7dc17a237e4752eb4ee1dbb56f6a56.tar.zst nixlib-6168c2e45f7dc17a237e4752eb4ee1dbb56f6a56.zip | |
Merge master into staging
This is to cleanup the (re-)revert of merge to master.
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/misc/intel-gpu-tools/default.nix | 18 |
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 9c131b72a316..3d8b29e4ebc2 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; { |