diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-04-24 18:53:33 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-04-24 19:00:34 -0400 |
| commit | b26ae506a94026d044124d3620a4fe1cdfd568ad (patch) | |
| tree | c30d3cc823477df85ecf2784fcc6c22667a75c1a /pkgs/applications | |
| parent | 7139c65c88bb24095fac1af34a1e4780eb224dfd (diff) | |
| download | nixlib-b26ae506a94026d044124d3620a4fe1cdfd568ad.tar nixlib-b26ae506a94026d044124d3620a4fe1cdfd568ad.tar.gz nixlib-b26ae506a94026d044124d3620a4fe1cdfd568ad.tar.bz2 nixlib-b26ae506a94026d044124d3620a4fe1cdfd568ad.tar.lz nixlib-b26ae506a94026d044124d3620a4fe1cdfd568ad.tar.xz nixlib-b26ae506a94026d044124d3620a4fe1cdfd568ad.tar.zst nixlib-b26ae506a94026d044124d3620a4fe1cdfd568ad.zip | |
git: Set PERL_PATH when building manual
Otherwise the build fails with the perplexing error
make: *** No rule to make target 'cmd-list.made', needed by 'doc.dep'. Stop.
make: Leaving directory '/tmp/nix-build-git-2.16.3.drv-0/git-2.16.3/Documentation'
on NixOS (but not on Debian, where it succeeds, presumably since it picks up the
system perl).
Diffstat (limited to 'pkgs/applications')
| -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 '' |