JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renderdoc: format, cleanup

Browse Source
This commit is contained in:
Sandro Jäckel 2021-08-02 09:36:11 +02:00
parent 94f66d6b9f
commit a322ea2345
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,12 +11,11 @@ let
rev = "renderdoc-modified-7"; rev = "renderdoc-modified-7";
sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6"; sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6";
}; };
pythonPackages = python3Packages;
cmakeBool = b: if b then "ON" else "OFF"; cmakeBool = b: if b then "ON" else "OFF";
in in
mkDerivation rec { mkDerivation rec {
version = "1.15";
pname = "renderdoc"; pname = "renderdoc";
version = "1.15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "baldurk"; owner = "baldurk";
@ -27,9 +26,9 @@ mkDerivation rec {
buildInputs = [ buildInputs = [
qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3 qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3
] # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2]) ] # ++ (with python3Packages; [pyside2 pyside2-tools shiboken2])
# TODO: figure out how to make cmake recognise pyside2 # TODO: figure out how to make cmake recognise pyside2
++ (lib.optional waylandSupport wayland); ++ lib.optional waylandSupport wayland;
nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ]; nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ];
@ -75,7 +74,7 @@ mkDerivation rec {
of any application using Vulkan, D3D11, OpenGL or D3D12 across of any application using Vulkan, D3D11, OpenGL or D3D12 across
Windows 7 - 10, Linux or Android. Windows 7 - 10, Linux or Android.
''; '';
maintainers = [maintainers.jansol]; maintainers = [ maintainers.jansol ];
platforms = ["i686-linux" "x86_64-linux"]; platforms = [ "i686-linux" "x86_64-linux" ];
}; };
} }