Skip to content

Commit

Permalink
git: fix darwin to linux cross-compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
szlend committed Oct 11, 2024
1 parent 4798df7 commit a5eb6ac
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pkgs/applications/version-management/git/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
, gzip # needed at runtime by gitweb.cgi
, withSsh ? false
, sysctl
, deterministic-host-uname # cross-compilation
, doInstallCheck ? !stdenv.hostPlatform.isDarwin # extremely slow on darwin
, tests
}:
Expand Down Expand Up @@ -84,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
done
'';

nativeBuildInputs = [ gettext perlPackages.perl makeWrapper pkg-config ]
nativeBuildInputs = [ deterministic-host-uname gettext perlPackages.perl makeWrapper pkg-config ]
++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_45 libxslt ];
buildInputs = [ curl openssl zlib expat cpio (if stdenv.hostPlatform.isFreeBSD then libiconvReal else libiconv) bash ]
Expand Down

0 comments on commit a5eb6ac

Please sign in to comment.