diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
| commit | ee6894ca1297afe0caf2f389c1f9a9220826b749 (patch) | |
| tree | 02f96b5744cef8bc55010fb8301f5b50c0748d4c /pkgs/applications/version-management/git-and-tools/git/default.nix | |
| parent | 392874b9b1411dc7b879997bd8776b921feea61d (diff) | |
| parent | 617c26df84d5670574864a9ccad0eaf8708bd86a (diff) | |
Merge staging into master
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 | 2 |
1 files changed, 0 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 e545cb33befec..38509dddeb8f4 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -58,8 +58,6 @@ stdenv.mkDerivation { + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "") + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ") - # XXX: USE_PCRE2 might be useful in general, look into it - # XXX other alpine options? + (if stdenv.hostPlatform.isMusl then "NO_SYS_POLL_H=1 NO_GETTEXT=YesPlease" else ""); # build git-credential-osxkeychain if darwin |