From 27809f0ec4f070156004ac4f2afaf1409d5eae05 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 4 Mar 2012 15:50:03 +0000 Subject: * No longer needed. svn path=/nixpkgs/trunk/; revision=32772 --- pkgs/tools/archivers/gnutar/default.nix | 14 +++----------- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 26c20ffc043f..fddd8db08867 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,8 +1,6 @@ -{stdenv, fetchurl, withMan ? false, help2man ? null}: +{ stdenv, fetchurl }: -assert withMan -> help2man != null; - -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "gnutar-1.25"; src = fetchurl { @@ -34,10 +32,4 @@ 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 {})) +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64f358b917c7..1af0e3fe2d4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -776,11 +776,7 @@ let gnused_4_2 = callPackage ../tools/text/gnused/4.2.nix { }; - gnutar = lowPrio (callPackage ../tools/archivers/gnutar { }); - - gnutarWithMan = callPackage ../tools/archivers/gnutar { - withMan = true; - }; + gnutar = callPackage ../tools/archivers/gnutar { }; gnuvd = callPackage ../tools/misc/gnuvd { }; -- cgit 1.4.1