pyrox.dev
Merge #27962: git: pcre1 -> pcre2
Except for gitMinimal, as pcre1 is in closure anyway so using pcre2
increases the size by ~1.4 MB.
+6
-2
pkgs/applications/version-management/git-and-tools/git/default.nix
+6
-2
pkgs/applications/version-management/git-and-tools/git/default.nix
···
1
1
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio
2
2
, gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
3
-
, gzip, openssh
3
+
, gzip, openssh, pcre2
4
4
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
5
5
, libxslt, tcl, tk, makeWrapper, libiconv
6
6
, svnSupport, subversionClient, perlLibs, smtpPerlLibs, gitwebPerlLibs
7
7
, guiSupport
8
8
, withManual ? true
9
9
, pythonSupport ? true
10
+
, withpcre2 ? true
10
11
, sendEmailSupport
11
12
, darwin
12
13
}:
···
44
45
++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
45
46
docbook_xsl docbook_xml_dtd_45 libxslt ]
46
47
++ stdenv.lib.optionals guiSupport [tcl tk]
48
+
++ stdenv.lib.optionals withpcre2 [ pcre2 ]
47
49
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ];
48
50
49
51
···
70
72
# so that `SPARSE_FLAGS' corresponds to the current architecture...
71
73
#doCheck = true;
72
74
73
-
installFlags = "NO_INSTALL_HARDLINKS=1";
75
+
installFlags = "NO_INSTALL_HARDLINKS=1"
76
+
+ (if withpcre2 then " USE_LIBPCRE2=1" else "");
77
+
74
78
75
79
preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
76
80
mkdir -p $out/bin