From e580181a13b16c737ce8c63dbf55fc4f60da1e30 Mon Sep 17 00:00:00 2001 From: Tobias Bora Date: Tue, 29 Aug 2023 19:56:23 +0200 Subject: [PATCH] =?UTF-8?q?raysession:=20Fix=20issues=20with=20qt=20not=20?= =?UTF-8?q?being=20patched=20(can=E2=80=99t=20find=20platform,=20qt=20vers?= =?UTF-8?q?ion=20mismatch=20error=20etc)=20(#236762)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: OTABI Tomoya --- pkgs/applications/audio/raysession/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/raysession/default.nix b/pkgs/applications/audio/raysession/default.nix index 279d0f85b218..f12fd7a15c00 100644 --- a/pkgs/applications/audio/raysession/default.nix +++ b/pkgs/applications/audio/raysession/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonApplication, libjack2, pydbus, pyliblo, pyqt5, qttools, which, bash }: +{ lib, fetchurl, buildPythonApplication, libjack2, pydbus, pyliblo, pyqt5, which, bash, qt5 }: buildPythonApplication rec { pname = "raysession"; @@ -20,8 +20,9 @@ buildPythonApplication rec { nativeBuildInputs = [ pyqt5 # pyuic5 and pyrcc5 to build resources. - qttools # lrelease to build translations. + qt5.qttools # lrelease to build translations. which # which to find lrelease. + qt5.wrapQtAppsHook ]; buildInputs = [ libjack2 bash ]; propagatedBuildInputs = [ pydbus pyliblo pyqt5 ]; @@ -36,6 +37,9 @@ buildPythonApplication rec { postFixup = '' wrapPythonProgramsIn "$out/share/raysession/src" "$out $pythonPath" + for file in $out/bin/*; do + wrapQtApp "$file" + done ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dddacbc237a2..582d1db4367b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12306,9 +12306,7 @@ with pkgs; pystring = callPackage ../development/libraries/pystring { }; - raysession = python3Packages.callPackage ../applications/audio/raysession { - inherit (qt5) qttools; - }; + raysession = python3Packages.callPackage ../applications/audio/raysession {}; revolt-desktop = callPackage ../applications/networking/instant-messengers/revolt-desktop { };