foundationdb: pin Boost 1.86 and fix Makefile (#376230)

This commit is contained in:
Arne Keller
2025-01-26 14:18:54 +01:00
committed by GitHub
3 changed files with 11 additions and 3 deletions
@@ -18,7 +18,7 @@ To enable FoundationDB, add the following to your
```nix
{
services.foundationdb.enable = true;
services.foundationdb.package = pkgs.foundationdb73; # FoundationDB 7.r3.x
services.foundationdb.package = pkgs.foundationdb73; # FoundationDB 7.3.x
}
```
+2
View File
@@ -135,6 +135,8 @@ let
license = licenses.asl20;
platforms = [ "x86_64-linux" ]
++ lib.optionals (!(avxEnabled version)) [ "aarch64-linux" ];
# Fails when cross-compiling with "/bin/sh: gcc-ar: not found"
broken = stdenv.buildPlatform != stdenv.hostPlatform;
maintainers = with maintainers; [ thoughtpolice lostnet ];
};
};
+8 -2
View File
@@ -11,7 +11,7 @@
openjdk,
mono,
openssl,
boost,
boost186,
pkg-config,
msgpack-cxx,
toml11,
@@ -26,7 +26,7 @@ in
foundationdb73 = cmakeBuild {
version = "7.3.42";
hash = "sha256-jQcm+HLai5da2pZZ7iLdN6fpQZxf5+/kkfv9OSXQ57c=";
inherit boost;
boost = boost186;
ssl = openssl;
patches = [
@@ -38,6 +38,12 @@ in
url = "https://github.com/apple/foundationdb/commit/c35a23d3f6b65698c3b888d76de2d93a725bff9c.patch";
hash = "sha256-bneRoZvCzJp0Hp/G0SzAyUyuDrWErSpzv+ickZQJR5w=";
})
# Add a dependency that prevents bindingtester to run before the python bindings are generated
# https://github.com/apple/foundationdb/pull/11859
(fetchpatch {
url = "https://github.com/apple/foundationdb/commit/8d04c97a74c6b83dd8aa6ff5af67587044c2a572.patch";
hash = "sha256-ZLIcmcfirm1+96DtTIr53HfM5z38uTLZrRNHAmZL6rc=";
})
];
};
}