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/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"