cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

git: fix installCheck on darwin

Browse source 
these days it wants `sysctl`
This commit is contained in:
Robert Scott 2023-05-06 15:18:28 +01:00
parent 21dfaa24ff
commit dd4c9eec90
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/version-management/git/default.nix
View file

@ -19,6 +19,7 @@
, pkg-config, glib, libsecret , pkg-config, glib, libsecret
, gzip # needed at runtime by gitweb.cgi , gzip # needed at runtime by gitweb.cgi
, withSsh ? false , withSsh ? false
, sysctl
, doInstallCheck ? !stdenv.isDarwin # extremely slow on darwin , doInstallCheck ? !stdenv.isDarwin # extremely slow on darwin
, tests , tests
}: }:
@ -294,6 +295,8 @@ stdenv.mkDerivation (finalAttrs: {
"PERL_PATH=${buildPackages.perl}/bin/perl" "PERL_PATH=${buildPackages.perl}/bin/perl"
]; ];
nativeInstallCheckInputs = lib.optional stdenv.isDarwin sysctl;
preInstallCheck = '' preInstallCheck = ''
installCheckFlagsArray+=( installCheckFlagsArray+=(
GIT_PROVE_OPTS="--jobs $NIX_BUILD_CORES --failures --state=failed,save" GIT_PROVE_OPTS="--jobs $NIX_BUILD_CORES --failures --state=failed,save"