Skip to content

renderdoc: fallback to python312 if shiboken2 is not available, adopt #416726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pbsds merged 2 commits into from
Jun 15, 2025
Merged

renderdoc: fallback to python312 if shiboken2 is not available, adopt #416726

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
153db4f
renderdoc: fallback to python312 if shiboken2 is not available
pbsds Jun 14, 2025
b39cad0
renderdoc: add pbsds to maintainers
pbsds Jun 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions pkgs/by-name/re/renderdoc/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
pcre,
pkg-config,
python3Packages,
python312Packages,
qt5,
stdenv,
vulkan-loader,
Expand All @@ -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";
Expand Down Expand Up @@ -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
Expand All @@ -71,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
makeWrapper
pcre
pkg-config
python3Packages.python
pythonPackages'.python
qt5.qtx11extras
qt5.wrapQtAppsHook
];
Expand Down Expand Up @@ -137,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);
};
})