* 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
This commit is contained in:
parent
b7642bfdfb
commit
b57e0d8829
|
@ -1,14 +1,14 @@
|
||||||
{stdenv, fetchurl, groff, less}:
|
{ stdenv, fetchurl, groff, less }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation rec {
|
||||||
name = "man-1.6f";
|
name = "man-1.6g";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://primates.ximian.com/~flucifredi/man/man-1.6f.tar.gz;
|
url = "http://primates.ximian.com/~flucifredi/man/${name}.tar.gz";
|
||||||
sha256 = "0v2z6ywhy8kd2fa3ywkqayhjdivbaqn6qvhx93a1ldw135z8q84z";
|
sha256 = "17wmp2ahkhl72cvfzshmck22dnq2lbjg0678swihj270yk1vip6c";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [groff less];
|
buildInputs = [ groff less ];
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
makeFlagsArray=(bindir=$out/bin sbindir=$out/sbin libdir=$out/lib mandir=$out/share/man)
|
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 \
|
substituteInPlace $out/lib/man.conf \
|
||||||
--replace "nroff -Tlatin1" "nroff" \
|
--replace "nroff -Tlatin1" "nroff" \
|
||||||
--replace "eqn -Tlatin1" "eqn -Tutf8"
|
--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 = {
|
meta = {
|
||||||
|
|
Loading…
Reference in New Issue