Skip to content

Commit 31795c5

Browse files
authored
renderdoc: Fix wayland support (#419973)
2 parents 7d951db + 752e52a commit 31795c5

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

pkgs/by-name/re/renderdoc/package.nix

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
nix-update-script,
1414
pcre,
1515
pkg-config,
16-
python3Packages,
16+
# python3Packages.shiboken2 is currently broken
1717
python312Packages,
1818
qt5,
1919
stdenv,
@@ -24,9 +24,6 @@
2424
}:
2525

2626
let
27-
pythonPackages' =
28-
# lib.meta.availableOn does not respect meta.broken?
29-
if python3Packages.shiboken2.meta.available then python3Packages else python312Packages;
3027
custom_swig = fetchFromGitHub {
3128
owner = "baldurk";
3229
repo = "swig";
@@ -55,9 +52,9 @@ stdenv.mkDerivation (finalAttrs: {
5552
[
5653
libXdmcp
5754
libpthreadstubs
58-
pythonPackages'.pyside2
59-
pythonPackages'.pyside2-tools
60-
pythonPackages'.shiboken2
55+
python312Packages.pyside2
56+
python312Packages.pyside2-tools
57+
python312Packages.shiboken2
6158
qt5.qtbase
6259
qt5.qtsvg
6360
vulkan-loader
@@ -75,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
7572
makeWrapper
7673
pcre
7774
pkg-config
78-
pythonPackages'.python
75+
python312Packages.python
7976
qt5.qtx11extras
8077
qt5.wrapQtAppsHook
8178
];
@@ -86,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
8683
(lib.cmakeFeature "BUILD_VERSION_DIST_VER" finalAttrs.version)
8784
(lib.cmakeFeature "BUILD_VERSION_DIST_CONTACT" "https://github.com/NixOS/nixpkgs/")
8885
(lib.cmakeBool "BUILD_VERSION_STABLE" true)
89-
(lib.cmakeBool "ENABLE_WAYLAND" waylandSupport)
86+
(lib.cmakeBool "ENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND" waylandSupport)
9087
];
9188

9289
dontWrapQtApps = true;
@@ -117,6 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
117114
in
118115
''
119116
wrapQtApp $out/bin/qrenderdoc \
117+
--set QT_QPA_PLATFORM "wayland;xcb" \
120118
--suffix LD_LIBRARY_PATH : "$out/lib:${libPath}"
121119
wrapProgram $out/bin/renderdoccmd \
122120
--suffix LD_LIBRARY_PATH : "$out/lib:${libPath}"
@@ -141,7 +139,10 @@ stdenv.mkDerivation (finalAttrs: {
141139
'';
142140
license = lib.licenses.mit;
143141
mainProgram = "renderdoccmd";
144-
maintainers = with lib.maintainers; [ pbsds ];
142+
maintainers = with lib.maintainers; [
143+
pbsds
144+
ShyAssassin
145+
];
145146
platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.i686);
146147
};
147148
})

0 commit comments

Comments
 (0)