Merge pull request #109443 from jojosch/php8-protobuf

phpExtensions.protobuf: fix build with PHP 8
NixOS · Jan 15, 2021 · 17631db · 17631db
2 parents 9797139 + 48038eb
commit 17631db
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix
@@ -1,4 +1,4 @@
-{ buildPecl, lib, pcre' }:
+{ buildPecl, lib, pcre', fetchpatch }:
 
 buildPecl {
   pname = "protobuf";
@@ -8,6 +8,23 @@ buildPecl {
 
   buildInputs = [ pcre' ];
 
+  patches = [
+    # TODO: remove with next update
+    (fetchpatch {
+      url = "https://github.com/protocolbuffers/protobuf/commit/823f351448f7c432bed40b89ee3309e0a94c1855.patch";
+      sha256 = "sha256-ozHtO8s9zvmh/+wBEge3Yn3n0pbpR3dAojJcuAg/G3s=";
+      stripLen = 4;
+      includes = [
+        "array.c"
+        "def.c"
+        "map.c"
+        "message.c"
+        "protobuf.h"
+        "wkt.inc"
+      ];
+    })
+  ];
+
   meta = with lib; {
     description = ''
       Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.