ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-05 20:19:16 +03:00
Code Issues Projects Releases Wiki Activity

git: fix build on FreeBSD native (#328779)

Browse Source 
* git: build with libiconvReal on FreeBSD

The git tests fail under FreeBSD libc's iconv.

* git: add sysctl check dependency on FreeBSD, same as Darwin
This commit is contained in:
Audrey Dutcher 2024-07-20 19:41:53 -07:00 committed by GitHub
parent c9ed026def
commit 2b6b8e29c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/version-management/git/default.nix
View File

@ -3,7 +3,7 @@
, gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
, openssh, pcre2, bash
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
, libxslt, tcl, tk, makeWrapper, libiconv
, libxslt, tcl, tk, makeWrapper, libiconv, libiconvReal
, svnSupport ? false, subversionClient, perlLibs, smtpPerlLibs
, perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform
, nlsSupport ? true
@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ 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 libiconv bash ]
buildInputs = [ curl openssl zlib expat cpio (if stdenv.isFreeBSD then libiconvReal else libiconv) bash ]
++ lib.optionals perlSupport [ perlPackages.perl ]
++ lib.optionals guiSupport [tcl tk]
++ lib.optionals withpcre2 [ pcre2 ]
@ -302,7 +302,7 @@ stdenv.mkDerivation (finalAttrs: {
"PERL_PATH=${buildPackages.perl}/bin/perl"
];
nativeInstallCheckInputs = lib.optional stdenv.isDarwin sysctl;
nativeInstallCheckInputs = lib.optional (stdenv.isDarwin || stdenv.isFreeBSD) sysctl;
preInstallCheck = ''
installCheckFlagsArray+=(