Merge branch 'staging'

I don't like to wait for the expat-induced rebuild to happen yet another
time on staging.

pkgs/tools/text/gawk/default.nix

@@ -32,7 +32,17 @@ stdenv.mkDerivation rec {
   configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}"
     ++ [(if interactive then "--with-readline=${readline.dev}" else "--without-readline")];
 
-  postInstall = "rm $out/bin/gawk-*";
+  postInstall =
+    if interactive then
+      ''
+        rm "$out"/bin/gawk-*
+        ln -s gawk.1 "''${!outputMan}"/share/man/man1/awk.1
+      ''
+    else # TODO: remove this other branch on a stdenv rebuild
+      ''
+        rm $out/bin/gawk-*
+        ln -s $man/share/man/man1/gawk.1 $man/share/man/man1/awk.1
+      '';
 
   meta = with stdenv.lib; {
     homepage = http://www.gnu.org/software/gawk/;