diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2019-11-28 11:27:31 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2019-11-28 11:29:19 +0000 |
| commit | 8c145dc0fb3a5f0b15f0a739eb70fc5637109dde (patch) | |
| tree | 6f6a1a73aea3ead94731167bee9c848982e0d895 /pkgs/applications/version-management | |
| parent | 353c83addeadda978b0d79daba2030dd0d5e8908 (diff) | |
| download | nixpkgs-8c145dc0fb3a5f0b15f0a739eb70fc5637109dde.tar nixpkgs-8c145dc0fb3a5f0b15f0a739eb70fc5637109dde.tar.gz nixpkgs-8c145dc0fb3a5f0b15f0a739eb70fc5637109dde.tar.bz2 nixpkgs-8c145dc0fb3a5f0b15f0a739eb70fc5637109dde.tar.lz nixpkgs-8c145dc0fb3a5f0b15f0a739eb70fc5637109dde.tar.xz nixpkgs-8c145dc0fb3a5f0b15f0a739eb70fc5637109dde.tar.zst nixpkgs-8c145dc0fb3a5f0b15f0a739eb70fc5637109dde.zip | |
git: build with python3
git-p4 seems to be python3 ready: https://github.com/git/git/blob/master/git-p4.py#L32
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 4 |
1 files changed, 2 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 a8e284c6fec..8a0253029e1 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, buildPackages -, curl, openssl, zlib, expat, perlPackages, python, gettext, cpio +, curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , openssh, pcre2 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 @@ -91,7 +91,7 @@ stdenv.mkDerivation { "SHELL_PATH=${stdenv.shell}" ] ++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"]) - ++ (if pythonSupport then ["PYTHON_PATH=${python}/bin/python"] else ["NO_PYTHON=1"]) + ++ (if pythonSupport then ["PYTHON_PATH=${python3}/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"] |