diff options
author | jansol <jhs@psonet.com> | 2020-03-12 01:45:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-11 23:45:19 +0000 |
commit | 711a86973ff0ee8c95900b4cad3558338c7b994c (patch) | |
tree | ef4c91ee49ff9e86efa294f3553d3a42514c7d69 /pkgs/applications/graphics | |
parent | 3e754e6bf6df795203de33c3ad4bfba461026ccb (diff) | |
download | nixlib-711a86973ff0ee8c95900b4cad3558338c7b994c.tar nixlib-711a86973ff0ee8c95900b4cad3558338c7b994c.tar.gz nixlib-711a86973ff0ee8c95900b4cad3558338c7b994c.tar.bz2 nixlib-711a86973ff0ee8c95900b4cad3558338c7b994c.tar.lz nixlib-711a86973ff0ee8c95900b4cad3558338c7b994c.tar.xz nixlib-711a86973ff0ee8c95900b4cad3558338c7b994c.tar.zst nixlib-711a86973ff0ee8c95900b4cad3558338c7b994c.zip |
renderdoc: 1.6 -> 1.7
Added libglvnd to fix replaying OpenGL captures with renderdoccmd
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/renderdoc/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 843801011f77..e345fcce01e3 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, mkDerivation , qtbase, qtx11extras, qtsvg, makeWrapper -, vulkan-loader, xorg, python3, python3Packages +, vulkan-loader, libglvnd, xorg, python3, python3Packages , bison, pcre, automake, autoconf, addOpenGLRunpath }: let @@ -13,14 +13,14 @@ let pythonPackages = python3Packages; in mkDerivation rec { - version = "1.6"; + version = "1.7"; pname = "renderdoc"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "0b2f9m5azzvcjbmxkwcl1d7jvvp720b81zwn19rrskznfcc2r1i8"; + sha256 = "0r0y0lx48hkyf39pgippsc9q8hdcf57bdva6gx7f35vlhicx5hlz"; }; buildInputs = [ @@ -52,8 +52,8 @@ mkDerivation rec { dontWrapQtApps = true; preFixup = '' - wrapQtApp $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib" - wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib" + wrapQtApp $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib:${libglvnd}/lib" + wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib:${libglvnd}/lib" ''; # The only documentation for this so far is in pkgs/build-support/add-opengl-runpath/setup-hook.sh |