diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-27 15:12:18 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-27 16:22:11 +0200 |
| commit | aea7216cf8f20e97b27f25f5d501ac9595d62376 (patch) | |
| tree | 70b9d5e3f94419c701c2b78973e7582e24321d8c /pkgs/applications/version-management | |
| parent | bebaf083cd297429f53ce3a86d77ad09702d3235 (diff) | |
| parent | 95bbe17a048edc87606d5f3e652c17a58922b962 (diff) | |
| download | nixlib-aea7216cf8f20e97b27f25f5d501ac9595d62376.tar nixlib-aea7216cf8f20e97b27f25f5d501ac9595d62376.tar.gz nixlib-aea7216cf8f20e97b27f25f5d501ac9595d62376.tar.bz2 nixlib-aea7216cf8f20e97b27f25f5d501ac9595d62376.tar.lz nixlib-aea7216cf8f20e97b27f25f5d501ac9595d62376.tar.xz nixlib-aea7216cf8f20e97b27f25f5d501ac9595d62376.tar.zst nixlib-aea7216cf8f20e97b27f25f5d501ac9595d62376.zip | |
Merge #27962: git: pcre1 -> pcre2
Except for gitMinimal, as pcre1 is in closure anyway so using pcre2 increases the size by ~1.4 MB.
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 8 |
1 files changed, 6 insertions, 2 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 746801eb9087..46c48fd1579f 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,12 +1,13 @@ { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc -, gzip, openssh +, gzip, openssh, pcre2 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, libiconv , svnSupport, subversionClient, perlLibs, smtpPerlLibs, gitwebPerlLibs , guiSupport , withManual ? true , pythonSupport ? true +, withpcre2 ? true , sendEmailSupport , darwin }: @@ -44,6 +45,7 @@ stdenv.mkDerivation { ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ] ++ stdenv.lib.optionals guiSupport [tcl tk] + ++ stdenv.lib.optionals withpcre2 [ pcre2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; @@ -70,7 +72,9 @@ stdenv.mkDerivation { # so that `SPARSE_FLAGS' corresponds to the current architecture... #doCheck = true; - installFlags = "NO_INSTALL_HARDLINKS=1"; + installFlags = "NO_INSTALL_HARDLINKS=1" + + (if withpcre2 then " USE_LIBPCRE2=1" else ""); + preInstall = stdenv.lib.optionalString stdenv.isDarwin '' mkdir -p $out/bin |