diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-13 19:32:51 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-13 19:32:51 +0200 |
| commit | 34946256a08de90e23ef9da777634c843d2045e9 (patch) | |
| tree | 6f4e759a3b5b661bc2affc95959cd716263ccaa2 /pkgs/shells | |
| parent | 2d0f1c81649807e56e50a27c5632c833f4342842 (diff) | |
| parent | 58834f727fab8c1c7d47c6f59b99ac42780b690a (diff) | |
| download | nixlib-34946256a08de90e23ef9da777634c843d2045e9.tar nixlib-34946256a08de90e23ef9da777634c843d2045e9.tar.gz nixlib-34946256a08de90e23ef9da777634c843d2045e9.tar.bz2 nixlib-34946256a08de90e23ef9da777634c843d2045e9.tar.lz nixlib-34946256a08de90e23ef9da777634c843d2045e9.tar.xz nixlib-34946256a08de90e23ef9da777634c843d2045e9.tar.zst nixlib-34946256a08de90e23ef9da777634c843d2045e9.zip | |
Merge #27424: stdenv: Don't put man pages into $doc
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/bash/4.4.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index dba31e41ca37..b4a2ba553881 100644 --- 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" |