Author: viric
Date: Sat Mar 3 09:52:55 2012
New Revision: 32749
URL: https://nixos.org/websvn/nix/?rev=32749&sc=1
Log:
Adding a manpage for tar, using help2man
Modified:
nixpkgs/trunk/pkgs/tools/archivers/gnutar/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/tools/archivers/gnutar/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/archivers/gnutar/default.nix Fri Mar 2
17:06:33 2012 (r32748)
+++ nixpkgs/trunk/pkgs/tools/archivers/gnutar/default.nix Sat Mar 3
09:52:55 2012 (r32749)
@@ -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 @@
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 {}))
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Mar 2 17:06:33
2012 (r32748)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Mar 3 09:52:55
2012 (r32749)
@@ -776,7 +776,11 @@
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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
