Author: eelco
Date: Tue Mar 6 10:10:56 2012
New Revision: 32811
URL: https://nixos.org/websvn/nix/?rev=32811&sc=1
Log:
* 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.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/misc/man/default.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/tools/misc/man/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/tools/misc/man/default.nix Tue Mar
6 09:41:04 2012 (r32810)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/misc/man/default.nix Tue Mar
6 10:10:56 2012 (r32811)
@@ -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 @@
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 = {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
