diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-04 15:50:03 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-04 15:50:03 +0000 |
| commit | 27809f0ec4f070156004ac4f2afaf1409d5eae05 (patch) | |
| tree | a3c77dc5ff05e499be1bfa1516510e0f3a7b4a1b | |
| parent | 0f81c6363f8ccb09143a71bd886d02dfcf7c01a6 (diff) | |
| download | nixlib-27809f0ec4f070156004ac4f2afaf1409d5eae05.tar nixlib-27809f0ec4f070156004ac4f2afaf1409d5eae05.tar.gz nixlib-27809f0ec4f070156004ac4f2afaf1409d5eae05.tar.bz2 nixlib-27809f0ec4f070156004ac4f2afaf1409d5eae05.tar.lz nixlib-27809f0ec4f070156004ac4f2afaf1409d5eae05.tar.xz nixlib-27809f0ec4f070156004ac4f2afaf1409d5eae05.tar.zst nixlib-27809f0ec4f070156004ac4f2afaf1409d5eae05.zip | |
* No longer needed.
svn path=/nixpkgs/trunk/; revision=32772
| -rw-r--r-- | pkgs/tools/archivers/gnutar/default.nix | 14 | ||||
| -rw-r--r-- | 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 { }; |