From af0261a8f7a1e41d71af509342ce4db81c082e18 Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Fri, 1 Apr 2022 01:40:18 +0300 Subject: [PATCH 1/2] renderdoc: add PySide dependencies back to build --- pkgs/applications/graphics/renderdoc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 3068ecd4c5cf..938f596beae4 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -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 ]; From bf16f1860cc9500d8c3a504b42a37e5a872ffc92 Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Fri, 1 Apr 2022 01:44:21 +0300 Subject: [PATCH 2/2] renderdoc: move derivation to more appropriate location --- .../graphics => development/tools}/renderdoc/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{applications/graphics => development/tools}/renderdoc/default.nix (100%) diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/development/tools/renderdoc/default.nix similarity index 100% rename from pkgs/applications/graphics/renderdoc/default.nix rename to pkgs/development/tools/renderdoc/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 318099a89a0e..0ae835976330 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };