From 539cb448795013e25674447bc63a53565dedab88 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 10 Oct 2023 11:25:59 -0400 Subject: [PATCH] qt6.qtgrpc: drop outdated patches --- pkgs/development/libraries/qt-6/default.nix | 10 +--------- pkgs/development/libraries/qt-6/modules/qtgrpc.nix | 2 -- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 27327081601b..c03633057a38 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -105,15 +105,7 @@ let qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { }; qtdeclarative = callPackage ./modules/qtdeclarative.nix { }; qtdoc = callPackage ./modules/qtdoc.nix { }; - qtgrpc = callPackage ./modules/qtgrpc.nix { - patches = [ - (fetchpatch2 { - # fix compatibility with protobuf 23 - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-grpc/-/raw/5cfb8728ca626af41d5dc2b1f642d026c011ec56/protobuf-23.patch"; - hash = "sha256-msVQEAt0DewOnZIgymGijJEpIXbfmMUkdbIyJ0ZNuok="; - }) - ]; - }; + qtgrpc = callPackage ./modules/qtgrpc.nix { }; qthttpserver = callPackage ./modules/qthttpserver.nix { }; qtimageformats = callPackage ./modules/qtimageformats.nix { }; qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { }; diff --git a/pkgs/development/libraries/qt-6/modules/qtgrpc.nix b/pkgs/development/libraries/qt-6/modules/qtgrpc.nix index 877dd2371c27..f2623dd3d566 100644 --- a/pkgs/development/libraries/qt-6/modules/qtgrpc.nix +++ b/pkgs/development/libraries/qt-6/modules/qtgrpc.nix @@ -3,12 +3,10 @@ , qtdeclarative , protobuf , grpc -, patches ? [] }: qtModule { pname = "qtgrpc"; qtInputs = [ qtbase qtdeclarative ]; buildInputs = [ protobuf grpc ]; - inherit patches; }