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

Merge pull request #56069 from delroth/git-diff-highlight

Browse Source 
git: build diff-highlight if Perl support is enabled
This commit is contained in:
Peter Simons 2019-06-14 17:27:02 +02:00 committed by GitHub
commit eeffb474bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,9 @@ stdenv.mkDerivation {
postBuild = '' postBuild = ''
make -C contrib/subtree 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 make -C contrib/credential/osxkeychain
'') + (stdenv.lib.optionalString withLibsecret '' '') + (stdenv.lib.optionalString withLibsecret ''
make -C contrib/credential/libsecret make -C contrib/credential/libsecret