nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #132326 from jansol/renderdoc

Browse Source 
renderdoc: 1.14 -> 1.15
This commit is contained in:
davidak 2021-08-02 06:19:39 +02:00 committed by GitHub
commit 08af2daa6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/graphics/renderdoc/default.nix
View File

@ -2,6 +2,7 @@
, qtbase, qtx11extras, qtsvg, makeWrapper
, vulkan-loader, libglvnd, xorg, python3, python3Packages
, bison, pcre, automake, autoconf, addOpenGLRunpath
, waylandSupport ? false, wayland
}:
let
custom_swig = fetchFromGitHub {
@ -11,22 +12,24 @@ let
sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6";
};
pythonPackages = python3Packages;
cmakeBool = b: if b then "ON" else "OFF";
in
mkDerivation rec {
version = "1.14";
version = "1.15";
pname = "renderdoc";
src = fetchFromGitHub {
owner = "baldurk";
repo = "renderdoc";
rev = "v${version}";
sha256 = "VO7pOLodXI0J7O4Y9b7YSl5BdtsIxmalFG5mqfuiJEw=";
sha256 = "HSWl3FC5YDIADO3h6oHxHdwsrFQKKj2zTtH2e3cc5iI=";
};
buildInputs = [
qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3
]; # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2]);
] # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2])
# TODO: figure out how to make cmake recognise pyside2
++ (lib.optional waylandSupport wayland);
nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ];
@ -42,6 +45,7 @@ mkDerivation rec {
"-DBUILD_VERSION_DIST_VER=${version}"
"-DBUILD_VERSION_DIST_CONTACT=https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc"
"-DBUILD_VERSION_STABLE=ON"
"-DENABLE_WAYLAND=${cmakeBool waylandSupport}"
];
# TODO: define these in the above array via placeholders, once those are widely supported