From 49144e91d12f678fc635ce4b230498ad3f3d3f95 Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Thu, 28 Mar 2024 18:32:00 +0100 Subject: [PATCH] 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 --- overlay.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/overlay.nix b/overlay.nix index 280611b..4a7cf1e 100644 --- a/overlay.nix +++ b/overlay.nix @@ -24,10 +24,17 @@ in version = "2.18.3-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 = [ ]; - # FIXME: we don't know why this was not being picked up properly when - # included in nativeCheckInputs. - nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ final.git ]; + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ + final.cmake + final.toml11 + # FIXME: we don't know why this was not being picked up properly when + # included in nativeCheckInputs. + final.git + ]; }); stable = nix_2_18; nix_2_18_upstream = prev.nixVersions.nix_2_18;