diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-03-01 09:06:20 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-03-01 09:06:20 +0100 |
| commit | 2fcb11a2442b27834db87b2f62511037c31b5e36 (patch) | |
| tree | e9d38370aac7632cd35207180dc7c87d2bb6171d /pkgs/tools/text | |
| parent | 456ff62ff820bbb2debd4568a775d88e61fd8bd1 (diff) | |
| parent | fc4a8f63c4e46652d484b127162641be36481363 (diff) | |
| download | nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.gz nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.bz2 nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.lz nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.xz nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.zst nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.zip | |
Merge staging-next into master
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/groff/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/text/groff/mdate-determinism.patch | 13 |
2 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 88d487da9b9c..082c61635ba9 100644 --- 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 new file mode 100644 index 000000000000..1253d1133940 --- /dev/null +++ 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" \ |