From b26ae506a94026d044124d3620a4fe1cdfd568ad Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 24 Apr 2018 18:53:33 -0400 Subject: [PATCH] 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). --- .../version-management/git-and-tools/git/default.nix | 5 +++-- 1 file 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 4e9f2bf16ce..74e88430239 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 ''