From ce15dafc7dc87fdaf8ddb7bc45d459fcbd237255 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 19 Feb 2019 22:52:13 +0100 Subject: [PATCH] git: build diff-highlight if Perl support is enabled Fixes #27671. git/git@0c977dbc8180892af42d7ab9235fd3e51d6c4078 made that script require an extra build step. --- .../version-management/git-and-tools/git/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 46e88b1e0fc4..d0ac51cd72ca 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -96,7 +96,9 @@ stdenv.mkDerivation { postBuild = '' make -C contrib/subtree - '' + (stdenv.lib.optionalString stdenv.isDarwin '' + '' + (stdenv.lib.optionalString perlSupport '' + make -C contrib/diff-highlight + '') + (stdenv.lib.optionalString stdenv.isDarwin '' make -C contrib/credential/osxkeychain '') + (stdenv.lib.optionalString withLibsecret '' make -C contrib/credential/libsecret