From fb1cac23639288cd96716ca76daf74bcf95bf212 Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Mon, 21 Oct 2024 17:33:38 +0100 Subject: [PATCH] protonmail-bridge-gui: patch source to support Qt 6.8 --- pkgs/by-name/pr/protonmail-bridge-gui/package.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix index 3cb289b614269..addb68181605b 100644 --- a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix +++ b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix @@ -60,6 +60,18 @@ stdenv.mkDerivation (finalAttrs: { # Don't build `bridge-gui-tester` sed -i "/add_subdirectory(bridge-gui-tester)/d" CMakeLists.txt + + # Qt 6.8 support + # fix "ColorImage is not a type" + find . -name '*.qml' -type f -exec sed -i ' + /import QtQuick.Controls/ { + n + /import QtQuick.Controls.impl/! { + i import QtQuick.Controls.impl + } + }' {} + + # fix "Cannot override FINAL property" + find . -name '*.qml' -type f -exec sed -i 's/\bpopupType\b/protonPopupType/g' {} + ''; cmakeFlags = [