From b0a59de1746ada067f545abe733a2d973d75b68b Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Tue, 27 Aug 2024 17:43:15 +0200 Subject: [PATCH] rgp: 2.1 -> 2.2 Version 2.2 was released: https://github.com/GPUOpen-Tools/radeon_gpu_profiler/releases/tag/v2.2 Qt was updated and supports wayland now (yay). Capturing and looking at the capture worked for me. --- pkgs/development/tools/rgp/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index 96d938ad2040..4e9f750520f9 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -18,19 +18,20 @@ , libXi , libxkbcommon , ncurses +, wayland , zlib }: let - buildNum = "2024-04-18-1396"; + buildNum = "2024-06-26-1341"; in stdenv.mkDerivation { pname = "rgp"; - version = "2.1"; + version = "2.2"; src = fetchurl { url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; - hash = "sha256-mP5tmq252IsWYVRGNKVib8ZbM5M4srUKXJ3x2ff4YhM="; + hash = "sha256-mpm4hxWyunq6Z6kdSuk4jqnYOTuLFVe+XzXZvHJPf/Q="; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; @@ -51,6 +52,7 @@ stdenv.mkDerivation { libXi libxkbcommon ncurses + wayland zlib ]; @@ -65,13 +67,11 @@ stdenv.mkDerivation { # makeWrapper is needed so that executables are started from the opt # directory, where qt.conf and other tools are. # Unset Qt theme, it does not work if the nixos Qt version is different from the packaged one. - # The packaged Qt version only supports X11, so enforce that. makeWrapper \ $out/opt/rgp/$prog \ $out/bin/$prog \ --unset QT_QPA_PLATFORMTHEME \ --unset QT_STYLE_OVERRIDE \ - --set QT_QPA_PLATFORM xcb \ --prefix LD_LIBRARY_PATH : $out/opt/rgp/lib done '';