pyrox.dev
git: fix build with strictDeps
+5
-4
pkgs/applications/version-management/git-and-tools/git/default.nix
+5
-4
pkgs/applications/version-management/git-and-tools/git/default.nix
···
1
1
{ fetchurl, lib, stdenv, buildPackages
2
2
, curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio
3
3
, gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
4
-
, openssh, pcre2
4
+
, openssh, pcre2, bash
5
5
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
6
6
, libxslt, tcl, tk, makeWrapper, libiconv
7
7
, svnSupport, subversionClient, perlLibs, smtpPerlLibs
···
73
73
nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ]
74
74
++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
75
75
docbook_xsl docbook_xml_dtd_45 libxslt ];
76
-
buildInputs = [curl openssl zlib expat cpio libiconv]
76
+
buildInputs = [ curl openssl zlib expat cpio libiconv bash ]
77
77
++ lib.optionals perlSupport [ perlPackages.perl ]
78
78
++ lib.optionals guiSupport [tcl tk]
79
79
++ lib.optionals withpcre2 [ pcre2 ]
···
84
84
NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s"
85
85
+ lib.optionalString (stdenv.isFreeBSD) "-lthr";
86
86
87
-
configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
87
+
configureFlags = [
88
+
"ac_cv_prog_CURL_CONFIG=${lib.getDev curl}/bin/curl-config"
89
+
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
88
90
"ac_cv_fread_reads_directories=yes"
89
91
"ac_cv_snprintf_returns_bogus=no"
90
92
"ac_cv_iconv_omits_bom=no"
91
-
"ac_cv_prog_CURL_CONFIG=${curl.dev}/bin/curl-config"
92
93
];
93
94
94
95
preBuild = ''