diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-02-15 12:57:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-15 12:57:56 -0500 |
| commit | 110b0eb2e534a2ab923738b7f5f4a25815e33a80 (patch) | |
| tree | deea5371a21c98dfbbecdb5d56b47730165c9b0c | |
| parent | f9798440511a644ba4ca23db6b6df15d11553b24 (diff) | |
| parent | 0799b6de749b863c5a647a35d2a9a018860ba299 (diff) | |
Merge pull request #288179 from NickCao/foundationdb-msgpack
foundationdb: use msgpack-cxx instead of msgpack
| -rw-r--r-- | pkgs/servers/foundationdb/cmake.nix | 4 | ||||
| -rw-r--r-- | 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 337d671275ada..bc0a17166631d 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 b9157dda9e3e7..966069e6ed6e1 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="; + }) ]; }; } |