BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #288179 from NickCao/foundationdb-msgpack

Browse source 
foundationdb: use msgpack-cxx instead of msgpack
This commit is contained in:
Nick Cao 2024-02-15 12:57:56 -05:00 committed by GitHub
commit 110b0eb2e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/servers/foundationdb/cmake.nix
View file

@ -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 ];

10
pkgs/servers/foundationdb/default.nix
View file

@ -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=";
})
];
};
}