From 53e80e5316148573a329674073bfb60592f5a00c Mon Sep 17 00:00:00 2001 From: LluĂ­s Batlle i Rossell Date: Sat, 3 Mar 2012 09:52:55 +0000 Subject: Adding a manpage for tar, using help2man svn path=/nixpkgs/trunk/; revision=32749 --- pkgs/tools/archivers/gnutar/default.nix | 14 +++++++++++--- pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index a38c7fcdd1e8..26c20ffc043f 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,6 +1,8 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, withMan ? false, help2man ? null}: -stdenv.mkDerivation rec { +assert withMan -> help2man != null; + +stdenv.mkDerivation (rec { name = "gnutar-1.25"; src = fetchurl { @@ -32,4 +34,10 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; -} +} // (if withMan then { + buildInputs = [ help2man ]; + postInstall = '' + ensureDir $out/share/man/man1 + help2man $out/bin/tar > $out/share/man/man1/tar.1 + ''; +} else {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58581324ba18..1894dccc955c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -776,7 +776,11 @@ let gnused_4_2 = callPackage ../tools/text/gnused/4.2.nix { }; - gnutar = callPackage ../tools/archivers/gnutar { }; + gnutar = lowPrio (callPackage ../tools/archivers/gnutar { }); + + gnutarWithMan = callPackage ../tools/archivers/gnutar { + withMan = true; + }; gnuvd = callPackage ../tools/misc/gnuvd { }; -- cgit 1.4.1