alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #191978 from jansol/renderdoc

Browse source
This commit is contained in:
Sandro 2022-11-30 16:21:34 +01:00 committed by GitHub
parent 8ba2586a31 bf16f1860c
commit 0a3ca27681
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/graphics/renderdoc/default.nix → pkgs/development/tools/renderdoc/default.nix
View file

@ -43,8 +43,9 @@ mkDerivation rec {
buildInputs = [
qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3
] # ++ (with python3Packages; [pyside2 pyside2-tools shiboken2])
# TODO: figure out how to make cmake recognise pyside2
] ++ (with python3Packages; [
pyside2 pyside2-tools shiboken2
])
++ lib.optional waylandSupport wayland;
nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ];

2
pkgs/top-level/all-packages.nix
View file

@ -11009,7 +11009,7 @@ with pkgs;
renameutils = callPackage ../tools/misc/renameutils { };
renderdoc = libsForQt5.callPackage ../applications/graphics/renderdoc { };
renderdoc = libsForQt5.callPackage ../development/tools/renderdoc { };
replace = callPackage ../tools/text/replace { };