From 3c5ffd9fa4f86d7cbd8ed59aa1f9e8b26bb5d085 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 28 Dec 2024 22:28:55 +0000 Subject: [PATCH] foundationdb: unpin OpenJDK --- pkgs/servers/foundationdb/cmake.nix | 4 ++-- pkgs/servers/foundationdb/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 56470052a64d..2d88687b00cc 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -1,7 +1,7 @@ # This builder is for FoundationDB CMake build system. { lib, fetchFromGitHub -, cmake, ninja, python3, openjdk8, mono, pkg-config +, cmake, ninja, python3, openjdk, mono, pkg-config , msgpack-cxx, toml11, jemalloc, doctest , gccStdenv, llvmPackages @@ -41,7 +41,7 @@ let checkInputs = [ doctest ]; - nativeBuildInputs = [ pkg-config cmake ninja python3 openjdk8 mono ] + nativeBuildInputs = [ pkg-config cmake ninja python3 openjdk mono ] ++ lib.optionals useClang [ llvmPackages.lld ]; separateDebugInfo = true; diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 35937a8302af..5a48c9337243 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -8,7 +8,7 @@ cmake, ninja, python3, - openjdk8, + openjdk, mono, openssl, boost,