diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-01-19 06:01:24 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-19 06:01:24 +0000 |
commit | 1b54e5bb501c7c610a5cc62bd96d003ce3892aa0 (patch) | |
tree | 7423b32ccd6c8f3e62c3fa93e54d079220d42832 /pkgs/applications/graphics | |
parent | 0fdca2427234e87738f955ed4b483ac6bc606b33 (diff) | |
parent | bb9046571d78d9cc63a239f7292db5f5b198f69c (diff) | |
download | nixpkgs-1b54e5bb501c7c610a5cc62bd96d003ce3892aa0.tar nixpkgs-1b54e5bb501c7c610a5cc62bd96d003ce3892aa0.tar.gz nixpkgs-1b54e5bb501c7c610a5cc62bd96d003ce3892aa0.tar.bz2 nixpkgs-1b54e5bb501c7c610a5cc62bd96d003ce3892aa0.tar.lz nixpkgs-1b54e5bb501c7c610a5cc62bd96d003ce3892aa0.tar.xz nixpkgs-1b54e5bb501c7c610a5cc62bd96d003ce3892aa0.tar.zst nixpkgs-1b54e5bb501c7c610a5cc62bd96d003ce3892aa0.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/renderdoc/default.nix | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 0faed5e12ea..30731afebfe 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -1,8 +1,25 @@ -{ lib, fetchFromGitHub, cmake, pkg-config, mkDerivation -, qtbase, qtx11extras, qtsvg, makeWrapper -, vulkan-loader, libglvnd, xorg, python3, python3Packages -, bison, pcre, automake, autoconf, addOpenGLRunpath -, waylandSupport ? false, wayland +{ lib +, fetchFromGitHub +, nix-update-script +, cmake +, pkg-config +, mkDerivation +, qtbase +, qtx11extras +, qtsvg +, makeWrapper +, vulkan-loader +, libglvnd +, xorg +, python3 +, python3Packages +, bison +, pcre +, automake +, autoconf +, addOpenGLRunpath +, waylandSupport ? false +, wayland }: let custom_swig = fetchFromGitHub { @@ -15,13 +32,13 @@ let in mkDerivation rec { pname = "renderdoc"; - version = "1.16"; + version = "1.17"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "150d1qzjs420clqr48gickiw5ymjx4md6iyjbxmxsdml0pyxpwwn"; + sha256 = "sha256-Zr7Av49mK48B4N+Ca2vPIgKuVNP4YLVEs4EQepukSs8="; }; buildInputs = [ @@ -64,6 +81,10 @@ mkDerivation rec { addOpenGLRunpath $out/lib/librenderdoc.so ''; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { description = "A single-frame graphics debugger"; homepage = "https://renderdoc.org/"; |