diff options
| author | Will Dietz <github@wdtz.org> | 2018-04-24 18:55:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-24 18:55:26 -0500 |
| commit | de40a77de83f327c601c311b32f8a5a9618011b2 (patch) | |
| tree | 10a9ae5156091ffd54eb6d64fc688e300d3c71d4 | |
| parent | 49ff3665a5268ff715b52a3ad0f9869de04d9ab3 (diff) | |
| parent | b26ae506a94026d044124d3620a4fe1cdfd568ad (diff) | |
| download | nixlib-de40a77de83f327c601c311b32f8a5a9618011b2.tar nixlib-de40a77de83f327c601c311b32f8a5a9618011b2.tar.gz nixlib-de40a77de83f327c601c311b32f8a5a9618011b2.tar.bz2 nixlib-de40a77de83f327c601c311b32f8a5a9618011b2.tar.lz nixlib-de40a77de83f327c601c311b32f8a5a9618011b2.tar.xz nixlib-de40a77de83f327c601c311b32f8a5a9618011b2.tar.zst nixlib-de40a77de83f327c601c311b32f8a5a9618011b2.zip | |
Merge pull request #39453 from bgamari/fix-git
git: Set PERL_PATH when building manual
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 5 |
1 files changed, 3 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 4e9f2bf16cea..74e88430239d 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,5 @@ -{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio +{ fetchurl, stdenv, buildPackages +, curl, openssl, zlib, expat, perl, python, 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 @@ -199,7 +200,7 @@ stdenv.mkDerivation { '') + stdenv.lib.optionalString withManual ''# Install man pages and Info manual - make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES cmd-list.made install install-info \ + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-info \ -C Documentation '' + (if guiSupport then '' |