From 092a7ac9a528cf5cd373595d48eb6578b5ce4ce4 Mon Sep 17 00:00:00 2001 From: "[Assassin]" Date: Wed, 25 Jun 2025 19:02:22 +0200 Subject: [PATCH 1/3] renderdoc: update cmake wayland flag --- pkgs/by-name/re/renderdoc/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix index b636999cd1c5..6319b9df1697 100644 --- a/pkgs/by-name/re/renderdoc/package.nix +++ b/pkgs/by-name/re/renderdoc/package.nix @@ -86,7 +86,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; @@ -117,6 +117,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}" From e1f5f6aae25964a6393f71bbfd64b0eed44c5a66 Mon Sep 17 00:00:00 2001 From: "[Assassin]" Date: Wed, 25 Jun 2025 19:04:07 +0200 Subject: [PATCH 2/3] renderdoc: add ShyAssassin to maintainers --- pkgs/by-name/re/renderdoc/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix index 6319b9df1697..5e9a022bcb0f 100644 --- a/pkgs/by-name/re/renderdoc/package.nix +++ b/pkgs/by-name/re/renderdoc/package.nix @@ -142,7 +142,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); }; }) From 752e52a56f00bff475d3b83c5b5a863ac60afae2 Mon Sep 17 00:00:00 2001 From: "[Assassin]" Date: Fri, 27 Jun 2025 16:40:57 +0200 Subject: [PATCH 3/3] renderdoc: force python312Packages --- pkgs/by-name/re/renderdoc/package.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix index 5e9a022bcb0f..7555e26de182 100644 --- a/pkgs/by-name/re/renderdoc/package.nix +++ b/pkgs/by-name/re/renderdoc/package.nix @@ -13,7 +13,7 @@ nix-update-script, pcre, pkg-config, - python3Packages, + # python3Packages.shiboken2 is currently broken python312Packages, qt5, stdenv, @@ -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"; @@ -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 @@ -75,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper pcre pkg-config - pythonPackages'.python + python312Packages.python qt5.qtx11extras qt5.wrapQtAppsHook ];