diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-06 10:10:56 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-06 10:10:56 +0000 |
| commit | b57e0d8829f08f66b1120f80de2cd3ac7c0c3042 (patch) | |
| tree | c7ce986c1e92a6deef711d76f9e56178d248e68a /pkgs/tools/misc/man/default.nix | |
| parent | b7642bfdfbdfe3e0e6f8e07aaaa442220171926e (diff) | |
| download | nixpkgs-b57e0d8829f08f66b1120f80de2cd3ac7c0c3042.tar nixpkgs-b57e0d8829f08f66b1120f80de2cd3ac7c0c3042.tar.gz nixpkgs-b57e0d8829f08f66b1120f80de2cd3ac7c0c3042.tar.bz2 nixpkgs-b57e0d8829f08f66b1120f80de2cd3ac7c0c3042.tar.lz nixpkgs-b57e0d8829f08f66b1120f80de2cd3ac7c0c3042.tar.xz nixpkgs-b57e0d8829f08f66b1120f80de2cd3ac7c0c3042.tar.zst nixpkgs-b57e0d8829f08f66b1120f80de2cd3ac7c0c3042.zip | |
* man: Work around a bug in substituteInPlace. It loses the final
newline, and man requires every line in man.conf to be terminated by a newline. We should fix the bug eventually though. * man updated to 1.6g. svn path=/nixpkgs/branches/stdenv-updates/; revision=32811
Diffstat (limited to 'pkgs/tools/misc/man/default.nix')
| -rw-r--r-- | pkgs/tools/misc/man/default.nix | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/tools/misc/man/default.nix b/pkgs/tools/misc/man/default.nix index 9e80cc69179..0e4568c2cd3 100644 --- a/pkgs/tools/misc/man/default.nix +++ b/pkgs/tools/misc/man/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, groff, less}: +{ stdenv, fetchurl, groff, less }: -stdenv.mkDerivation { - name = "man-1.6f"; - +stdenv.mkDerivation rec { + name = "man-1.6g"; + src = fetchurl { - url = http://primates.ximian.com/~flucifredi/man/man-1.6f.tar.gz; - sha256 = "0v2z6ywhy8kd2fa3ywkqayhjdivbaqn6qvhx93a1ldw135z8q84z"; + url = "http://primates.ximian.com/~flucifredi/man/${name}.tar.gz"; + sha256 = "17wmp2ahkhl72cvfzshmck22dnq2lbjg0678swihj270yk1vip6c"; }; - buildInputs = [groff less]; + buildInputs = [ groff less ]; preBuild = '' makeFlagsArray=(bindir=$out/bin sbindir=$out/sbin libdir=$out/lib mandir=$out/share/man) @@ -30,6 +30,11 @@ stdenv.mkDerivation { substituteInPlace $out/lib/man.conf \ --replace "nroff -Tlatin1" "nroff" \ --replace "eqn -Tlatin1" "eqn -Tutf8" + + # Work around a bug in substituteInPlace. It loses the final + # newline, and man requires every line in man.conf to be + # terminated by a newline. + echo >> $out/lib/man.conf ''; meta = { |