Unverified Commit 1bd65724 authored by dotlambda's avatar dotlambda Committed by GitHub
Browse files

protonmail-bridge-gui: add Qt 6.10 compatibility patches (#456754)

parents 591830fb e14ef480

pkgs/by-name/pr/protonmail-bridge-gui/package.nix

+17 −1
Original line number Diff line number Diff line
@@ -12,8 +12,12 @@ 
  gtest,

  sentry-native,

  protonmail-bridge,

  fetchpatch2,

}:



let

  guiSourcePath = "internal/frontend/bridge-gui";

in

stdenv.mkDerivation (finalAttrs: {

  pname = "protonmail-bridge-gui";
@@ -22,6 +26,18 @@ stdenv.mkDerivation (finalAttrs: { 
  patches = [

    # Use `gtest` from Nixpkgs to allow an offline build

    ./use-nix-googletest.patch

    # fix: qt6_generate_deploy_app_script deprecated keyword

    (fetchpatch2 {

      url = "https://github.com/daniel-fahey/proton-bridge/commit/9b282369523ce2aabcf95369a2ed3867efb5a4ac.patch?full_index=1";

      relative = guiSourcePath;

      hash = "sha256-CGBelsplAqLI+6GtDR+VELfVsLoHPN0324gfZ3obKpI=";

    })

    # fix: make libQt6WaylandEglClientHwIntegration conditional for Qt 6.10

    (fetchpatch2 {

      url = "https://github.com/daniel-fahey/proton-bridge/commit/7823fe4904186253798fc633724988d43dd642e0.patch?full_index=1";

      relative = guiSourcePath;

      hash = "sha256-2heMfZdXLL8/uyM0jZ860Jw76c+gHtc0G6pWmIRCONY=";

    })

  ];



  nativeBuildInputs = [
@@ -44,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { 
    sentry-native

  ];



  sourceRoot = "${finalAttrs.src.name}/internal/frontend/bridge-gui";

  sourceRoot = "${finalAttrs.src.name}/${guiSourcePath}";



  postPatch = ''

    # Bypass `vcpkg` by deleting lines that `include` BridgeSetup.cmake