Merge commit '3b29468313bc8604fe8f85c8d9316fd276d3985c' into HEAD

2017-08-21 04:44:40 +02:00
parent 96457d26dd 3b29468313
commit 6bbc3a0b24
117 changed files with 614 additions and 652 deletions
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
    "TZDIR=$(out)/share/zoneinfo"
    "ETCDIR=$(TMPDIR)/etc"
    "LIBDIR=$(dev)/lib"
-    "MANDIR=$(man)/man"
+    "MANDIR=$(man)/share/man"
    "AWK=awk"
    "CFLAGS=-DHAVE_LINK=0"
  ];