Unverified Commit 08af2daa authored by davidak's avatar davidak Committed by GitHub
Browse files

Merge pull request #132326 from jansol/renderdoc 

renderdoc: 1.14 -> 1.15
parents 2a6732c3 a9b07d1c

pkgs/applications/graphics/renderdoc/default.nix

+7 −3
Original line number Diff line number Diff line
@@ -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