diff options
| author | Wout Mertens <Wout.Mertens@gmail.com> | 2020-05-18 21:28:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 21:28:58 +0200 |
| commit | fd05023849628b5201b79f986af76f663d077da6 (patch) | |
| tree | 76a495fa7ef5d9aa9ea565503222da0b6c724bb3 /pkgs/applications | |
| parent | f8a9c6efac0199d72884e82117636b5896b7e202 (diff) | |
| parent | 9f2faa1f6f14b977e4b91523b6c2621bb77f7b62 (diff) | |
| download | nixlib-fd05023849628b5201b79f986af76f663d077da6.tar nixlib-fd05023849628b5201b79f986af76f663d077da6.tar.gz nixlib-fd05023849628b5201b79f986af76f663d077da6.tar.bz2 nixlib-fd05023849628b5201b79f986af76f663d077da6.tar.lz nixlib-fd05023849628b5201b79f986af76f663d077da6.tar.xz nixlib-fd05023849628b5201b79f986af76f663d077da6.tar.zst nixlib-fd05023849628b5201b79f986af76f663d077da6.zip | |
Merge pull request #86848 from primeos/git-add-doc-output
git: Add a doc output for the HTML and text files
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index c591ef554ee4..48fa002463b3 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -82,6 +82,14 @@ let inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; + git-doc = lib.addMetaAttrs { + description = "Additional documentation for Git"; + longDescription = '' + This package contains additional documentation (HTML and text files) that + is referenced in the man pages of Git. + ''; + } gitFull.doc; + git-extras = callPackage ./git-extras { }; git-fame = callPackage ./git-fame {}; 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 9c1a01f42ae8..140a273e342e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { sha256 = "0j685w6pzkn926z5nf5r8fij4ziipvw4c9yb0wc577nzf4j16rbd"; }; - outputs = [ "out" ]; + outputs = [ "out" "doc" ]; hardeningDisable = [ "format" ]; @@ -234,7 +234,7 @@ stdenv.mkDerivation { '') + stdenv.lib.optionalString withManual ''# Install man pages and Info manual - make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" 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-html install-info \ -C Documentation '' + (if guiSupport then '' |