pyrox.dev
Merge pull request #288179 from NickCao/foundationdb-msgpack
foundationdb: use msgpack-cxx instead of msgpack
+2
-2
pkgs/servers/foundationdb/cmake.nix
+2
-2
pkgs/servers/foundationdb/cmake.nix
···
2
2
3
3
{ lib, fetchFromGitHub
4
4
, cmake, ninja, python3, openjdk8, mono, pkg-config
5
-
, msgpack, toml11
5
+
, msgpack-cxx, toml11
6
6
7
7
, gccStdenv, llvmPackages
8
8
, useClang ? false
···
37
37
inherit rev hash;
38
38
};
39
39
40
-
buildInputs = [ ssl boost msgpack toml11 ];
40
+
buildInputs = [ ssl boost msgpack-cxx toml11 ];
41
41
42
42
nativeBuildInputs = [ pkg-config cmake ninja python3 openjdk8 mono ]
43
43
++ lib.optionals useClang [ llvmPackages.lld ];
+8
-2
pkgs/servers/foundationdb/default.nix
+8
-2
pkgs/servers/foundationdb/default.nix
···
1
1
{ gccStdenv, llvmPackages
2
-
, lib, fetchFromGitHub
2
+
, lib, fetchFromGitHub, fetchpatch
3
3
4
4
, cmake, ninja, python3, openjdk8, mono, openssl, boost178
5
-
, pkg-config, msgpack, toml11
5
+
, pkg-config, msgpack-cxx, toml11
6
6
}@args:
7
7
8
8
let
···
19
19
./patches/don-t-run-tests-requiring-doctest.patch
20
20
./patches/don-t-use-static-boost-libs.patch
21
21
./patches/fix-open-with-O_CREAT.patch
22
+
# GetMsgpack: add 4+ versions of upstream
23
+
# https://github.com/apple/foundationdb/pull/10935
24
+
(fetchpatch {
25
+
url = "https://github.com/apple/foundationdb/commit/c35a23d3f6b65698c3b888d76de2d93a725bff9c.patch";
26
+
hash = "sha256-bneRoZvCzJp0Hp/G0SzAyUyuDrWErSpzv+ickZQJR5w=";
27
+
})
22
28
];
23
29
};
24
30
}