public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39453 from bgamari/fix-git

Browse Source 
git: Set PERL_PATH when building manual
This commit is contained in:
Will Dietz
2018-04-24 18:55:26 -05:00
committed by GitHub
parent 49ff3665a5 b26ae506a9
commit de40a77de8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@@ -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 ''