public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

man-db: wrap groff instead of compiling in

Browse Source 
Some manpages, e.g. `systemd.time` were broken in a way that they
were rendered from the beginning after part of the page, and then only
lasted for maybe a third of their length.

So we just add groff in the wrapper instead of the configure phase like
every other distribution seems to do, and that fixes it.
Patch by @Mic92.

Fixes #19323.
This commit is contained in:
Profpatsch 2016-10-07 12:38:02 +02:00 committed by Franz Pletz
parent bef6bef0d2
commit fa5d919ae9
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/tools/misc/man-db/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff }: { stdenv, fetchurl, pkgconfig, libpipeline, db, groff, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "man-db-2.7.5"; name = "man-db-2.7.5";
@ -11,9 +11,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];
outputMan = "out"; # users will want `man man` to work outputMan = "out"; # users will want `man man` to work
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ libpipeline db groff ]; buildInputs = [ libpipeline db groff ];
troff="${groff}/bin/groff";
postPatch = '' postPatch = ''
substituteInPlace src/man_db.conf.in \ substituteInPlace src/man_db.conf.in \
@ -27,14 +26,14 @@ stdenv.mkDerivation rec {
# Don't try /etc/man_db.conf by default, so we avoid error messages. # Don't try /etc/man_db.conf by default, so we avoid error messages.
"--with-config-file=\${out}/etc/man_db.conf" "--with-config-file=\${out}/etc/man_db.conf"
"--with-systemdtmpfilesdir=\${out}/lib/tmpfiles.d" "--with-systemdtmpfilesdir=\${out}/lib/tmpfiles.d"
"--with-eqn=${groff}/bin/eqn"
"--with-neqn=${groff}/bin/neqn"
"--with-nroff=${groff}/bin/nroff"
"--with-pic=${groff}/bin/pic"
"--with-refer=${groff}/bin/refer"
"--with-tbl=${groff}/bin/tbl"
]; ];
postInstall = ''
for i in "$out/bin/"*; do
wrapProgram "$i" --prefix PATH : "${groff}/bin"
done
'';
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = true; doCheck = true;