From 153db4fb74b503574c72dc08e00e2781c6877bc3 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 14 Jun 2025 17:38:55 +0200 Subject: [PATCH 1/2] renderdoc: fallback to python312 if shiboken2 is not available shiboken2 is marked broken on python313, and python3 will default to python313 in the next staging-next merge --- pkgs/by-name/re/renderdoc/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix index 2755dc5a94ac1..76c14963ba048 100644 --- a/pkgs/by-name/re/renderdoc/package.nix +++ b/pkgs/by-name/re/renderdoc/package.nix @@ -14,6 +14,7 @@ pcre, pkg-config, python3Packages, + python312Packages, qt5, stdenv, vulkan-loader, @@ -23,6 +24,9 @@ }: let + pythonPackages' = + # lib.meta.availableOn does not respect meta.broken? + if python3Packages.shiboken2.meta.available then python3Packages else python312Packages; custom_swig = fetchFromGitHub { owner = "baldurk"; repo = "swig"; @@ -51,9 +55,9 @@ stdenv.mkDerivation (finalAttrs: { [ libXdmcp libpthreadstubs - python3Packages.pyside2 - python3Packages.pyside2-tools - python3Packages.shiboken2 + pythonPackages'.pyside2 + pythonPackages'.pyside2-tools + pythonPackages'.shiboken2 qt5.qtbase qt5.qtsvg vulkan-loader @@ -71,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper pcre pkg-config - python3Packages.python + pythonPackages'.python qt5.qtx11extras qt5.wrapQtAppsHook ]; From b39cad06bfdfb450b1bcc29bc208223ecdd0195a Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 14 Jun 2025 17:47:33 +0200 Subject: [PATCH 2/2] renderdoc: add pbsds to maintainers Upstream is a bit unresponsive to certain issues, but this package deserves some love. I'll modernize it later. --- pkgs/by-name/re/renderdoc/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix index 76c14963ba048..b636999cd1c56 100644 --- a/pkgs/by-name/re/renderdoc/package.nix +++ b/pkgs/by-name/re/renderdoc/package.nix @@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.mit; mainProgram = "renderdoccmd"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ pbsds ]; platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.i686); }; })