fix: add cmake and toml11 to inputs

toml11 is needed anyway, cmake is only needed for meson. meson isn't
needed right now but let's not have this cause problems *again* soon
This commit is contained in:
eldritch horrors 2024-03-28 18:32:00 +01:00
parent 5d64b01d02
commit eabed5a04f

View file

@ -24,10 +24,17 @@ in
version = "2.18.3-lix${versionSuffix}"; version = "2.18.3-lix${versionSuffix}";
VERSION_SUFFIX = "-lix${versionSuffix}"; VERSION_SUFFIX = "-lix${versionSuffix}";
# We only include CMake so that Meson can locate toml11, which only ships CMake dependency metadata.
dontUseCmakeConfigure = true;
patches = [ ]; patches = [ ];
nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [
final.cmake
final.toml11
# FIXME: we don't know why this was not being picked up properly when # FIXME: we don't know why this was not being picked up properly when
# included in nativeCheckInputs. # included in nativeCheckInputs.
nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ final.git ]; final.git
];
}); });
stable = nix_2_18; stable = nix_2_18;
nix_2_18_upstream = prev.nixVersions.nix_2_18; nix_2_18_upstream = prev.nixVersions.nix_2_18;