Unverified Commit 39ae1a94 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #255895 from NickCao/qtgrpc

qt6.qtgrpc: add patch for protobuf 23 support
parents 10f5e2ef 7efb824d
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@
, stdenv
, fetchurl
, fetchpatch
, fetchpatch2
, makeSetupHook
, makeWrapper
, gst_all_1
@@ -104,7 +105,15 @@ let
      qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { };
      qtdeclarative = callPackage ./modules/qtdeclarative.nix { };
      qtdoc = callPackage ./modules/qtdoc.nix { };
      qtgrpc = callPackage ./modules/qtgrpc.nix { };
      qtgrpc = callPackage ./modules/qtgrpc.nix {
        patches = [
          (fetchpatch2 {
            # fix compatibility with protobuf 23
            url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-grpc/-/raw/d6b33bd915dc6e63b30db2cd29150d55b289d7ed/protobuf-23.patch";
            hash = "sha256-KQAcrjQ3rK9pDQUOUK6AS4ej8YvtRv9WZOxby31Y5r4=";
          })
        ];
      };
      qthttpserver = callPackage ./modules/qthttpserver.nix { };
      qtimageformats = callPackage ./modules/qtimageformats.nix { };
      qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { };
+2 −0
Original line number Diff line number Diff line
@@ -3,10 +3,12 @@
, qtdeclarative
, protobuf
, grpc
, patches ? []
}:

qtModule {
  pname = "qtgrpc";
  qtInputs = [ qtbase qtdeclarative ];
  buildInputs = [ protobuf grpc ];
  inherit patches;
}