pyrox.dev
apitrace: 7.1.old -> 11.1
Update from 2015 to current latest release.
+23
-13
pkgs/applications/graphics/apitrace/default.nix
+23
-13
pkgs/applications/graphics/apitrace/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit, wrapQtAppsHook, libglvnd }:
2
3
stdenv.mkDerivation rec {
4
pname = "apitrace";
5
-
version = "7.1-572-g${builtins.substring 0 8 src.rev}";
6
7
src = fetchFromGitHub {
8
-
sha256 = "11bwb0l8cr1bf9bj1s6cbmi77d5fy4qrphj9cgmcd8jpa862anp5";
9
-
rev = "26966134f15d28f6b4a9a0a560017b3ba36d60bf";
10
repo = "apitrace";
11
-
owner = "apitrace";
12
};
13
14
-
patches = [
15
-
# glibc 2.34 compat
16
-
# derived from https://github.com/apitrace/apitrace/commit/d28a980802ad48568c87da02d630c8babfe163bb
17
-
./glibc-2.34-compat.patch
18
-
];
19
-
20
# LD_PRELOAD wrappers need to be statically linked to work against all kinds
21
# of games -- so it's fine to use e.g. bundled snappy.
22
-
buildInputs = [ libX11 procps python2 libdwarf qtbase qtwebkit ];
23
24
-
nativeBuildInputs = [ cmake wrapQtAppsHook ];
25
26
# Don't automatically wrap all binaries, I prefer to explicitly only wrap
27
# `qapitrace`.
···
1
+
{
2
+
lib,
3
+
stdenv,
4
+
fetchFromGitHub,
5
+
cmake,
6
+
pkg-config,
7
+
libX11,
8
+
procps,
9
+
python3,
10
+
libdwarf,
11
+
qtbase,
12
+
wrapQtAppsHook,
13
+
libglvnd,
14
+
gtest,
15
+
brotli,
16
+
}:
17
18
stdenv.mkDerivation rec {
19
pname = "apitrace";
20
+
version = "11.1";
21
22
src = fetchFromGitHub {
23
+
owner = "apitrace";
24
repo = "apitrace";
25
+
rev = version;
26
+
hash = "sha256-rvC6iVWNNxH11hzQvRTo+SQi9jEUCPWGSdJmKJe9SQ0=";
27
+
fetchSubmodules = true;
28
};
29
30
# LD_PRELOAD wrappers need to be statically linked to work against all kinds
31
# of games -- so it's fine to use e.g. bundled snappy.
32
+
buildInputs = [ libX11 procps python3 libdwarf qtbase gtest brotli ];
33
34
+
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
35
36
# Don't automatically wrap all binaries, I prefer to explicitly only wrap
37
# `qapitrace`.
-13
pkgs/applications/graphics/apitrace/glibc-2.34-compat.patch
-13
pkgs/applications/graphics/apitrace/glibc-2.34-compat.patch
···
1
-
diff --git a/wrappers/dlsym.cpp b/wrappers/dlsym.cpp
2
-
index 2eda082..0c0c8ee 100644
3
-
--- a/wrappers/dlsym.cpp
4
-
+++ b/wrappers/dlsym.cpp
5
-
@@ -34,7 +34,7 @@
6
-
#include "os.hpp"
7
-
8
-
9
-
-#ifdef __GLIBC__
10
-
+#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 34
11
-
12
-
13
-
#include <dlfcn.h>
···
+1
-1
pkgs/top-level/all-packages.nix
+1
-1
pkgs/top-level/all-packages.nix