From 57b20131f7cd52d1d01aa4dbf4f0e7f7fb49a421 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 27 May 2025 17:49:47 +0400 Subject: [PATCH] qutebrowser: fix on darwin --- pkgs/by-name/qu/qutebrowser/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix index 21b7878cb75b..c16483060a98 100644 --- a/pkgs/by-name/qu/qutebrowser/package.nix +++ b/pkgs/by-name/qu/qutebrowser/package.nix @@ -8,6 +8,7 @@ asciidoc, docbook_xml_dtd_45, docbook_xsl, + desktopToDarwinBundle, libxml2, libxslt, withPdfReader ? true, @@ -69,7 +70,7 @@ python3.pkgs.buildPythonApplication { docbook_xsl libxml2 libxslt - ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; dependencies = with python3.pkgs; [ colorama @@ -131,6 +132,11 @@ python3.pkgs.buildPythonApplication { preFixup = let libPath = lib.makeLibraryPath [ pipewire ]; + resourcesPath = + if (isQt6 && stdenv.hostPlatform.isDarwin) then + "${qt6Packages.qtwebengine}/lib/QtWebEngineCore.framework/Resources" + else + "${qt6Packages.qtwebengine}/resources"; in '' makeWrapperArgs+=( @@ -145,7 +151,7 @@ python3.pkgs.buildPythonApplication { --set-default QSG_RHI_BACKEND vulkan ''} ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''} - --set QTWEBENGINE_RESOURCES_PATH "${qt6Packages.qtwebengine}/resources" + --set QTWEBENGINE_RESOURCES_PATH "${resourcesPath}" ) '';