Skip to content

Commit 9ef71cb

Browse files
committed
fix(nix): Add git and tomlplusplus build dependencies
Add missing dependencies to Nix package: - git: Required by CMake FetchContent for cloning dependencies - tomlplusplus: Provide from nixpkgs instead of FetchContent from GitHub Fixes Nix sandbox build failures where network access is blocked. Nix flake checks now pass: format, license, and build all succeed. Tests: 190 passed, 8 failed (World spacing validation), 12 skipped (MPI).
1 parent ab4e368 commit 9ef71cb

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

nix/openpfc/default.nix

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-FileCopyrightText: 2025 VTT Technical Research Centre of Finland Ltd
22
# SPDX-License-Identifier: AGPL-3.0-or-later
33

4-
{ lib, stdenv, ninja, cmake, mpi, heffte, nlohmann_json, catch2_3 ? null
4+
{ lib, stdenv, ninja, cmake, git, mpi, heffte, tomlplusplus, nlohmann_json, catch2_3 ? null
55
, doxygen ? null, version, src, buildType ? "Release", enableDocs ? true
66
, enableTests ? true, enableExamples ? true, enableApps ? true }:
77

@@ -15,9 +15,9 @@ stdenv.mkDerivation {
1515
platforms = lib.platforms.linux;
1616
};
1717

18-
nativeBuildInputs = [ ninja cmake ];
18+
nativeBuildInputs = [ ninja cmake git ];
1919

20-
buildInputs = [ mpi heffte nlohmann_json ] ++ lib.optional enableDocs doxygen
20+
buildInputs = [ mpi heffte tomlplusplus nlohmann_json ] ++ lib.optional enableDocs doxygen
2121
++ lib.optional enableTests catch2_3;
2222

2323
cmakeFlags = [
@@ -29,5 +29,6 @@ stdenv.mkDerivation {
2929
"-DOpenPFC_BUILD_DOCUMENTATION=${if enableDocs then "ON" else "OFF"}"
3030
"-DOpenPFC_ENABLE_CODE_COVERAGE=OFF"
3131
"-DHeffte_DIR=${heffte}/lib/cmake/Heffte"
32+
"-Dtomlplusplus_DIR=${tomlplusplus}/lib/cmake/tomlplusplus"
3233
];
3334
}

0 commit comments

Comments
 (0)