diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-04-13 16:48:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 16:48:38 -0400 |
| commit | e520d6af29158ff6d17c34ec16b1f2e79bccad45 (patch) | |
| tree | ddf031dda697cba7549ed8357ca3454c30433fbd /pkgs/applications/version-management/git-and-tools/git | |
| parent | 940c35568bc2fa135eafe0817027c765d9840469 (diff) | |
| parent | c6ff360cc437d366c10f2f827edd5a7fb47e73c3 (diff) | |
| download | nixlib-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar nixlib-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.gz nixlib-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.bz2 nixlib-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.lz nixlib-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.xz nixlib-e520d6af29158ff6d17c34ec16b1f2e79bccad45.tar.zst nixlib-e520d6af29158ff6d17c34ec16b1f2e79bccad45.zip | |
Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020
Cross compilation fixes [april 2020]
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/git')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 6169c2d0296b..ca3bf667b4a1 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -80,6 +80,8 @@ stdenv.mkDerivation { configureFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_fread_reads_directories=yes" "ac_cv_snprintf_returns_bogus=no" + "ac_cv_iconv_omits_bom=no" + "ac_cv_prog_CURL_CONFIG=${curl.dev}/bin/curl-config" ]; preBuild = '' |