diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-12-10 13:52:34 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-04-24 14:58:58 -0400 |
| commit | d111a42772bc4c878a2ba3106cf573d5bcf0c9fe (patch) | |
| tree | 76bc30fe2576870266ee049aaf7fe915c0a22f12 /pkgs/applications | |
| parent | 2d397f1b76199fa877b6091e4f63e980582faeff (diff) | |
| download | nixlib-d111a42772bc4c878a2ba3106cf573d5bcf0c9fe.tar nixlib-d111a42772bc4c878a2ba3106cf573d5bcf0c9fe.tar.gz nixlib-d111a42772bc4c878a2ba3106cf573d5bcf0c9fe.tar.bz2 nixlib-d111a42772bc4c878a2ba3106cf573d5bcf0c9fe.tar.lz nixlib-d111a42772bc4c878a2ba3106cf573d5bcf0c9fe.tar.xz nixlib-d111a42772bc4c878a2ba3106cf573d5bcf0c9fe.tar.zst nixlib-d111a42772bc4c878a2ba3106cf573d5bcf0c9fe.zip | |
git: Enable cross-compilation
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 13 |
1 files changed, 9 insertions, 4 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 08be2a618f79..4e9f2bf16cea 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation { done ''; - nativeBuildInputs = [ perl ]; - buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv] - ++ stdenv.lib.optionals perlSupport [ perl ] + nativeBuildInputs = [ gettext perl ] ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x - docbook_xsl docbook_xml_dtd_45 libxslt ] + docbook_xsl docbook_xml_dtd_45 libxslt ]; + buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv] + ++ stdenv.lib.optionals perlSupport [ perl ] ++ stdenv.lib.optionals guiSupport [tcl tk] ++ stdenv.lib.optionals withpcre2 [ pcre2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; @@ -62,6 +62,11 @@ stdenv.mkDerivation { NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr"; + configureFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "ac_cv_fread_reads_directories=yes" + "ac_cv_snprintf_returns_bogus=no" + ]; + makeFlags = [ "prefix=\${out}" "SHELL_PATH=${stdenv.shell}" |