diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-12-10 14:08:23 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-04-24 14:58:58 -0400 |
| commit | 432df5b1cf9fc6b36634ee26c621cda462dd98b2 (patch) | |
| tree | c921f1924d756a6a38ac72d7208f10533c96931a /pkgs/applications/version-management | |
| parent | ae0a14d25dfa8da22e20d5164c8243e32a34b44a (diff) | |
| download | nixlib-432df5b1cf9fc6b36634ee26c621cda462dd98b2.tar nixlib-432df5b1cf9fc6b36634ee26c621cda462dd98b2.tar.gz nixlib-432df5b1cf9fc6b36634ee26c621cda462dd98b2.tar.bz2 nixlib-432df5b1cf9fc6b36634ee26c621cda462dd98b2.tar.lz nixlib-432df5b1cf9fc6b36634ee26c621cda462dd98b2.tar.xz nixlib-432df5b1cf9fc6b36634ee26c621cda462dd98b2.tar.zst nixlib-432df5b1cf9fc6b36634ee26c621cda462dd98b2.zip | |
git: Fix USE_LIBPCRE2 configuration
Previously this was injected during install, causing the build system to rebuild the entire package.
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 7 |
1 files changed, 3 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 10b70626197e..23b7e24965e8 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -63,7 +63,8 @@ stdenv.mkDerivation { ++ (if pythonSupport then ["PYTHON_PATH=${python}/bin/python"] else ["NO_PYTHON=1"]) ++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc/"]) - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"]; + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"] + ++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1"; # build git-credential-osxkeychain if darwin postBuild = stdenv.lib.optionalString stdenv.isDarwin '' @@ -76,9 +77,7 @@ stdenv.mkDerivation { # so that `SPARSE_FLAGS' corresponds to the current architecture... #doCheck = true; - installFlags = "NO_INSTALL_HARDLINKS=1" - + (if withpcre2 then " USE_LIBPCRE2=1" else ""); - + installFlags = "NO_INSTALL_HARDLINKS=1"; preInstall = stdenv.lib.optionalString stdenv.isDarwin '' mkdir -p $out/bin |