diff options
| author | Peter Simons <simons@cryp.to> | 2010-02-18 12:08:39 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2010-02-18 12:08:39 +0000 |
| commit | c7e5f6a80b0e03782ecb3f2375a952fbe1b4bf7a (patch) | |
| tree | dad05b9ef087194f841e258458e2d839308c47e2 /pkgs | |
| parent | 9bcb6277f3bb97340673cae70fbe17561fbd88a0 (diff) | |
| download | nixlib-c7e5f6a80b0e03782ecb3f2375a952fbe1b4bf7a.tar nixlib-c7e5f6a80b0e03782ecb3f2375a952fbe1b4bf7a.tar.gz nixlib-c7e5f6a80b0e03782ecb3f2375a952fbe1b4bf7a.tar.bz2 nixlib-c7e5f6a80b0e03782ecb3f2375a952fbe1b4bf7a.tar.lz nixlib-c7e5f6a80b0e03782ecb3f2375a952fbe1b4bf7a.tar.xz nixlib-c7e5f6a80b0e03782ecb3f2375a952fbe1b4bf7a.tar.zst nixlib-c7e5f6a80b0e03782ecb3f2375a952fbe1b4bf7a.zip | |
pkgs/applications/version-management/git-and-tools/git: version 1.7.0 needs Python
svn path=/nixpkgs/trunk/; revision=20096
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index ada4a07b9cd0..01baefa691bf 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -8,7 +8,7 @@ in rec { git = import ./git { - inherit fetchurl stdenv curl openssl zlib expat perl gettext + inherit fetchurl stdenv curl openssl zlib expat perl python gettext asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl tk makeWrapper subversion; 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 50cfeeeb2a8e..1e725a2c60a2 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, cpio +{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper , svnSupport, subversion, perlLibs @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_45 libxslt ] ++ stdenv.lib.optionals guiSupport [tcl tk]; - makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}"; + makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} PYTHON_PATH=${python}/bin/python"; # FIXME: "make check" requires Sparse; the Makefile must be tweaked # so that `SPARSE_FLAGS' corresponds to the current architecture... |