Skip to content

renderdoc: Fix wayland support #419973

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 3 commits into from
Jun 28, 2025
Merged

renderdoc: Fix wayland support #419973

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
092a7ac
renderdoc: update cmake wayland flag
ShyAssassin Jun 25, 2025
e1f5f6a
renderdoc: add ShyAssassin to maintainers
ShyAssassin Jun 25, 2025
752e52a
renderdoc: force python312Packages
ShyAssassin Jun 27, 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
21 changes: 11 additions & 10 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 @@ -13,7 +13,7 @@
nix-update-script,
pcre,
pkg-config,
python3Packages,
# python3Packages.shiboken2 is currently broken
python312Packages,
qt5,
stdenv,
Expand All @@ -24,9 +24,6 @@
}:

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 @@ -55,9 +52,9 @@ stdenv.mkDerivation (finalAttrs: {
[
libXdmcp
libpthreadstubs
pythonPackages'.pyside2
pythonPackages'.pyside2-tools
pythonPackages'.shiboken2
python312Packages.pyside2
python312Packages.pyside2-tools
python312Packages.shiboken2
qt5.qtbase
qt5.qtsvg
vulkan-loader
Expand All @@ -75,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
makeWrapper
pcre
pkg-config
pythonPackages'.python
python312Packages.python
qt5.qtx11extras
qt5.wrapQtAppsHook
];
Expand All @@ -86,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeFeature "BUILD_VERSION_DIST_VER" finalAttrs.version)
(lib.cmakeFeature "BUILD_VERSION_DIST_CONTACT" "https://github.com/NixOS/nixpkgs/")
(lib.cmakeBool "BUILD_VERSION_STABLE" true)
(lib.cmakeBool "ENABLE_WAYLAND" waylandSupport)
(lib.cmakeBool "ENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND" waylandSupport)
];

dontWrapQtApps = true;
Expand Down Expand Up @@ -117,6 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
in
''
wrapQtApp $out/bin/qrenderdoc \
--set QT_QPA_PLATFORM "wayland;xcb" \
--suffix LD_LIBRARY_PATH : "$out/lib:${libPath}"
wrapProgram $out/bin/renderdoccmd \
--suffix LD_LIBRARY_PATH : "$out/lib:${libPath}"
Expand All @@ -141,7 +139,10 @@ stdenv.mkDerivation (finalAttrs: {
'';
license = lib.licenses.mit;
mainProgram = "renderdoccmd";
maintainers = with lib.maintainers; [ pbsds ];
maintainers = with lib.maintainers; [
pbsds
ShyAssassin
];
platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.i686);
};
})