From dd4c9eec90fdbe392f55b8698560818ebb10b3a3 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 6 May 2023 15:18:28 +0100 Subject: [PATCH] git: fix installCheck on darwin these days it wants `sysctl` --- pkgs/applications/version-management/git/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index e3dd18e80c26..e037dfc51c61 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -19,6 +19,7 @@ , pkg-config, glib, libsecret , gzip # needed at runtime by gitweb.cgi , withSsh ? false +, sysctl , doInstallCheck ? !stdenv.isDarwin # extremely slow on darwin , tests }: @@ -294,6 +295,8 @@ stdenv.mkDerivation (finalAttrs: { "PERL_PATH=${buildPackages.perl}/bin/perl" ]; + nativeInstallCheckInputs = lib.optional stdenv.isDarwin sysctl; + preInstallCheck = '' installCheckFlagsArray+=( GIT_PROVE_OPTS="--jobs $NIX_BUILD_CORES --failures --state=failed,save"