diff options
| author | mimadrid <mimadrid@ucm.es> | 2017-08-05 16:39:33 +0200 |
|---|---|---|
| committer | mimadrid <mimadrid@ucm.es> | 2017-08-07 14:55:30 +0200 |
| commit | 95bbe17a048edc87606d5f3e652c17a58922b962 (patch) | |
| tree | f47cc25c3747fe6468d0c9c69c11f8a4d9a24021 /pkgs/applications/version-management/git-and-tools/git/default.nix | |
| parent | 46f586fb25337433068e2c1faed21a89e90aabea (diff) | |
| download | nixlib-95bbe17a048edc87606d5f3e652c17a58922b962.tar nixlib-95bbe17a048edc87606d5f3e652c17a58922b962.tar.gz nixlib-95bbe17a048edc87606d5f3e652c17a58922b962.tar.bz2 nixlib-95bbe17a048edc87606d5f3e652c17a58922b962.tar.lz nixlib-95bbe17a048edc87606d5f3e652c17a58922b962.tar.xz nixlib-95bbe17a048edc87606d5f3e652c17a58922b962.tar.zst nixlib-95bbe17a048edc87606d5f3e652c17a58922b962.zip | |
git: add pcre2 support
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/git/default.nix')
| -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 0b93ae1f2034..54bb7719f29a 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 |