diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2024-08-17 23:06:55 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2024-08-23 08:36:50 +0000 |
| commit | 094faf4bf74e6aff0329860591c70b26db0bbc9b (patch) | |
| tree | dd233dbb81a1bdae96af7ad169693a858a22fd82 | |
| parent | Merge pull request #336703 from NixOS/backport-336618-to-release-24.05 (diff) | |
| download | nixpkgs-origin/backport-336265-to-release-24.05.tar.gz | |
nixStatic: use git and man in installCheckInputsorigin/backport-336265-to-release-24.05
This fixes the nix 2.24 build.
Update pkgs/tools/package-management/nix/common.nix
Co-authored-by: tobim <tobim+github@fastmail.fm>
(cherry picked from commit 6687a981a168c19230b083fbb03e7ff9747350f1)
| -rw-r--r-- | pkgs/tools/package-management/nix/common.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 74287df14275..daec22d7882e 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -72,8 +72,7 @@ in , sqlite , util-linuxMinimal , xz - -, enableDocumentation ? !atLeast24 || stdenv.hostPlatform == stdenv.buildPlatform +, enableDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform , enableStatic ? stdenv.hostPlatform.isStatic , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp @@ -102,6 +101,8 @@ self = stdenv.mkDerivation { hardeningDisable = lib.optional stdenv.hostPlatform.isMusl "fortify"; + nativeInstallCheckInputs = lib.optional atLeast221 git ++ lib.optional atLeast219 man; + nativeBuildInputs = [ pkg-config autoconf-archive @@ -152,11 +153,6 @@ self = stdenv.mkDerivation { aws-sdk-cpp ]; - installCheckInputs = lib.optionals atLeast221 [ - git - ] ++ lib.optionals atLeast219 [ - man - ]; propagatedBuildInputs = [ boehmgc @@ -243,6 +239,9 @@ self = stdenv.mkDerivation { # See https://github.com/NixOS/nix/issues/5687 + lib.optionalString (atLeast25 && stdenv.isDarwin) '' echo "exit 99" > tests/gc-non-blocking.sh + '' + '' + # nixStatic otherwise does not find its man pages in tests. + export MANPATH=$man/share/man:$MANPATH ''; separateDebugInfo = stdenv.isLinux && (atLeast24 -> !enableStatic); |