Merge #27424: stdenv: Don't put man pages into $doc

2017-08-13 19:32:51 +02:00
parent 2d0f1c8164 58834f727f
commit 34946256a0
49 changed files with 62 additions and 64 deletions
--- a/pkgs/shells/bash/4.4.nix
+++ b/pkgs/shells/bash/4.4.nix
@@ -36,10 +36,9 @@ stdenv.mkDerivation rec {

  hardeningDisable = [ "format" ];

-  outputs = [ "out" "dev" "doc" "info" ];
-
-  # the man pages are small and useful enough
-  outputMan = if interactive then "out" else null;
+  outputs = [ "out" "dev" "doc" "info" ]
+    # the man pages are small and useful enough, so include them in $out in interactive builds
+    ++ stdenv.lib.optional (!interactive) "man";

  NIX_CFLAGS_COMPILE = ''
    -DSYS_BASHRC="/etc/bashrc"