From cb9e4b5e56d50f86d6c8ff90d67c841d4e79211a Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 13 Nov 2022 17:09:49 +0300 Subject: apitrace: 7.1.old -> 11.1 Update from 2015 to current latest release. --- pkgs/applications/graphics/apitrace/default.nix | 36 ++++++++++++++++--------- 1 file changed, 23 insertions(+), 13 deletions(-) (limited to 'pkgs/applications/graphics/apitrace/default.nix') diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index 756f0da9f3481..8d642c67820e7 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -1,27 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit, wrapQtAppsHook, libglvnd }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + libX11, + procps, + python3, + libdwarf, + qtbase, + wrapQtAppsHook, + libglvnd, + gtest, + brotli, +}: stdenv.mkDerivation rec { pname = "apitrace"; - version = "7.1-572-g${builtins.substring 0 8 src.rev}"; + version = "11.1"; src = fetchFromGitHub { - sha256 = "11bwb0l8cr1bf9bj1s6cbmi77d5fy4qrphj9cgmcd8jpa862anp5"; - rev = "26966134f15d28f6b4a9a0a560017b3ba36d60bf"; - repo = "apitrace"; owner = "apitrace"; + repo = "apitrace"; + rev = version; + hash = "sha256-rvC6iVWNNxH11hzQvRTo+SQi9jEUCPWGSdJmKJe9SQ0="; + fetchSubmodules = true; }; - patches = [ - # glibc 2.34 compat - # derived from https://github.com/apitrace/apitrace/commit/d28a980802ad48568c87da02d630c8babfe163bb - ./glibc-2.34-compat.patch - ]; - # LD_PRELOAD wrappers need to be statically linked to work against all kinds # of games -- so it's fine to use e.g. bundled snappy. - buildInputs = [ libX11 procps python2 libdwarf qtbase qtwebkit ]; + buildInputs = [ libX11 procps python3 libdwarf qtbase gtest brotli ]; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; # Don't automatically wrap all binaries, I prefer to explicitly only wrap # `qapitrace`. -- cgit 1.4.1