mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
Code Issues Wiki Activity

git: Enable cross-compilation

Browse source
This commit is contained in:
Ben Gamari 2017-12-10 13:52:34 -05:00
parent 2d397f1b76
commit d111a42772
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/applications/version-management/git-and-tools/git/default.nix
View file

@ -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}"