Unverified Commit 0a3ca276 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #191978 from jansol/renderdoc

parents 8ba2586a bf16f186

pkgs/applications/graphics/renderdoc/default.nix→pkgs/development/tools/renderdoc/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -43,8 +43,9 @@ mkDerivation rec { 


  buildInputs = [

    qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3

  ] # ++ (with python3Packages; [pyside2 pyside2-tools shiboken2])

  # TODO: figure out how to make cmake recognise pyside2

  ] ++ (with python3Packages; [

    pyside2 pyside2-tools shiboken2

  ])

  ++ lib.optional waylandSupport wayland;



  nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ];

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -11009,7 +11009,7 @@ with pkgs; 














  renameutils = callPackage ../tools/misc/renameutils { };



























  renderdoc = libsForQt5.callPackage ../applications/graphics/renderdoc { };













  renderdoc = libsForQt5.callPackage ../development/tools/renderdoc { };





























  replace = callPackage ../tools/text/replace { };