diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-11-30 00:34:23 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-11-30 00:34:23 +0200 |
commit | 8a4d6516ee6d6f526543fba01b2b6814fadf6c4e (patch) | |
tree | 0996f477a4a0badf9a1b6cf0aa7c9aa4da3256b9 /pkgs/applications/graphics/apitrace/default.nix | |
parent | 56366b5e668d4d5086cbadbb04c5dbc01a798581 (diff) | |
parent | 2587611ed5916e8fad810a4a2038e12ed85337c0 (diff) | |
download | nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar.gz nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar.bz2 nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar.lz nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar.xz nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.tar.zst nixlib-8a4d6516ee6d6f526543fba01b2b6814fadf6c4e.zip |
Merge remote-tracking branch 'upstream/staging' into master
Diffstat (limited to 'pkgs/applications/graphics/apitrace/default.nix')
-rw-r--r-- | pkgs/applications/graphics/apitrace/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index e130b23a8aaa..a9b2eb1163af 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libX11, procps, python, libdwarf, qtbase, qtwebkit }: +{ stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit }: stdenv.mkDerivation rec { name = "apitrace-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # 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 python libdwarf qtbase qtwebkit ]; + buildInputs = [ libX11 procps python2 libdwarf qtbase qtwebkit ]; nativeBuildInputs = [ cmake ]; |