diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b4090cd48707..1adc9a129e3c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14057,6 +14057,12 @@ githubId = 913109; name = "Emil Fresk"; }; + kornholi = { + email = "kornholijo@gmail.com"; + github = "kornholi"; + githubId = 659440; + name = "Kornelijus"; + }; koschi13 = { email = "maximilian.konter@protonmail.com"; github = "koschi13"; diff --git a/pkgs/by-name/fo/foundationdb/package.nix b/pkgs/by-name/fo/foundationdb/package.nix index 4e7b7ee201ab..dd4cb12813a5 100644 --- a/pkgs/by-name/fo/foundationdb/package.nix +++ b/pkgs/by-name/fo/foundationdb/package.nix @@ -15,6 +15,7 @@ toml11, jemalloc, doctest, + zlib, }: let boost = boost186; @@ -29,13 +30,13 @@ let in stdenv.mkDerivation rec { pname = "foundationdb"; - version = "7.3.42"; + version = "7.3.68"; src = fetchFromGitHub { owner = "apple"; repo = "foundationdb"; tag = version; - hash = "sha256-jQcm+HLai5da2pZZ7iLdN6fpQZxf5+/kkfv9OSXQ57c="; + hash = "sha256-OaV7YyBggeX3vrnI2EYwlWdIGRHOAeP5OZN0Rmd/dnw="; }; patches = [ @@ -80,6 +81,7 @@ stdenv.mkDerivation rec { msgpack-cxx openssl toml11 + zlib ]; checkInputs = [ doctest ]; @@ -107,6 +109,12 @@ stdenv.mkDerivation rec { "-DBUILD_DOCUMENTATION=FALSE" + # Disable the default static linking to libc++, libstdc++ and libgcc. + # + # This leads to various, non-obvious problems as our dependencies bring in + # their own copies of these libraries. + "-DSTATIC_LINK_LIBCXX=FALSE" + # LTO brings up overall build time, but results in much smaller # binaries for all users and the cache. "-DUSE_LTO=ON" @@ -171,6 +179,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ thoughtpolice lostnet + kornholi ]; }; }