From 0799b6de749b863c5a647a35d2a9a018860ba299 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sun, 11 Feb 2024 21:22:44 -0500
Subject: [PATCH] foundationdb: use msgpack-cxx instead of msgpack

---
 pkgs/servers/foundationdb/cmake.nix   |  4 ++--
 pkgs/servers/foundationdb/default.nix | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index 337d671275ad..bc0a17166631 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -2,7 +2,7 @@
 
 { lib, fetchFromGitHub
 , cmake, ninja, python3, openjdk8, mono, pkg-config
-, msgpack, toml11
+, msgpack-cxx, toml11
 
 , gccStdenv, llvmPackages
 , useClang ? false
@@ -37,7 +37,7 @@ let
           inherit rev hash;
         };
 
-        buildInputs = [ ssl boost msgpack toml11 ];
+        buildInputs = [ ssl boost msgpack-cxx toml11 ];
 
         nativeBuildInputs = [ pkg-config cmake ninja python3 openjdk8 mono ]
           ++ lib.optionals useClang [ llvmPackages.lld ];
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index b9157dda9e3e..966069e6ed6e 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -1,8 +1,8 @@
 { gccStdenv, llvmPackages
-, lib, fetchFromGitHub
+, lib, fetchFromGitHub, fetchpatch
 
 , cmake, ninja, python3, openjdk8, mono, openssl, boost178
-, pkg-config, msgpack, toml11
+, pkg-config, msgpack-cxx, toml11
 }@args:
 
 let
@@ -19,6 +19,12 @@ in {
       ./patches/don-t-run-tests-requiring-doctest.patch
       ./patches/don-t-use-static-boost-libs.patch
       ./patches/fix-open-with-O_CREAT.patch
+      # GetMsgpack: add 4+ versions of upstream
+      # https://github.com/apple/foundationdb/pull/10935
+      (fetchpatch {
+        url = "https://github.com/apple/foundationdb/commit/c35a23d3f6b65698c3b888d76de2d93a725bff9c.patch";
+        hash = "sha256-bneRoZvCzJp0Hp/G0SzAyUyuDrWErSpzv+ickZQJR5w=";
+      })
     ];
   };
 }