diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2019-02-19 22:52:13 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2019-02-20 01:11:32 +0100 |
| commit | ce15dafc7dc87fdaf8ddb7bc45d459fcbd237255 (patch) | |
| tree | 6f2cc136531a3d0dc6a99faa2460e6f562400695 /pkgs/applications/version-management/git-and-tools | |
| parent | e20188f181ca51882984daaee237a95f2fc5e7c9 (diff) | |
| download | nixlib-ce15dafc7dc87fdaf8ddb7bc45d459fcbd237255.tar nixlib-ce15dafc7dc87fdaf8ddb7bc45d459fcbd237255.tar.gz nixlib-ce15dafc7dc87fdaf8ddb7bc45d459fcbd237255.tar.bz2 nixlib-ce15dafc7dc87fdaf8ddb7bc45d459fcbd237255.tar.lz nixlib-ce15dafc7dc87fdaf8ddb7bc45d459fcbd237255.tar.xz nixlib-ce15dafc7dc87fdaf8ddb7bc45d459fcbd237255.tar.zst nixlib-ce15dafc7dc87fdaf8ddb7bc45d459fcbd237255.zip | |
git: build diff-highlight if Perl support is enabled
Fixes #27671. git/git@0c977dbc8180892af42d7ab9235fd3e51d6c4078 made that script require an extra build step.
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 4 |
1 files changed, 3 insertions, 1 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 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 |