From 04836c73e5589ec10bef08992a7ef815a7f7592c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 21 Jan 2024 14:01:57 -0500 Subject: [PATCH] Merge `nativeCheckInputs` into `nativeBuildInputs` They were getting skipped for the test-against checks. --- package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/package.nix b/package.nix index d1d14d10e..1f895e301 100644 --- a/package.nix +++ b/package.nix @@ -209,6 +209,10 @@ in { (lib.getBin lowdown) mdbook mdbook-linkcheck + ] ++ lib.optionals doInstallCheck [ + git + mercurial + openssh ] ++ lib.optionals (doInstallCheck || enableManual) [ jq # Also for custom mdBook preprocessor. ] ++ lib.optional stdenv.hostPlatform.isLinux util-linux @@ -249,12 +253,6 @@ in { dontBuild = !attrs.doBuild; doCheck = attrs.doCheck; - nativeCheckInputs = [ - git - mercurial - openssh - ]; - disallowedReferences = [ boost ]; preConfigure = lib.optionalString (doBuild && ! stdenv.hostPlatform.isStatic) (