Merge pull request #55729 from tilpner/groff-man-determinism

groff: Remove indeterminism in manpages
NixOS · Feb 14, 2019 · 3cf2745 · 3cf2745
2 parents a25d48c + 5888fae
commit 3cf2745
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
@@ -18,7 +18,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = false;
 
-  patches = [ ./look-for-ar.patch ];
+  patches = [
+    ./look-for-ar.patch
+    ./mdate-determinism.patch
+  ];
 
   postPatch = stdenv.lib.optionalString (psutils != null) ''
     substituteInPlace src/preproc/html/pre-html.cpp \

diff --git a/pkgs/tools/text/groff/mdate-determinism.patch b/pkgs/tools/text/groff/mdate-determinism.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.comm b/Makefile.comm
+index 75efc22..b757000 100644
+--- a/Makefile.comm
++++ b/Makefile.comm
+@@ -155,7 +155,7 @@ extraclean: distclean
+ 	     -e "s|@MAN1EXT@|$(man1ext)|g" \
+ 	     -e "s|@MAN5EXT@|$(man5ext)|g" \
+ 	     -e "s|@MAN7EXT@|$(man7ext)|g" \
+-	     -e "s|@MDATE@|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \
++	     -e "s|@MDATE@|`date +'%-d %B %Y' -r $(top_srcdir)/ChangeLog`|g" \
+ 	     -e "s|@OLDFONTDIR@|$(oldfontdir)|g" \
+ 	     -e "s|@PDFDOCDIR@|$(pdfdocdir)|g" \
+ 	     -e "s|@SYSTEMMACRODIR@|$(systemtmacdir)|g" \