diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-21 04:44:40 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-21 04:44:40 +0200 |
| commit | 6bbc3a0b245ccf392a8ddbce41b372c17409f0e9 (patch) | |
| tree | 7c76fd40defb9e9907c2b352f9cb98874a84eca0 /pkgs/shells/bash | |
| parent | 96457d26dded05bcba8e9fbb9bf0255596654aab (diff) | |
| parent | 3b29468313bc8604fe8f85c8d9316fd276d3985c (diff) | |
| download | nixlib-6bbc3a0b245ccf392a8ddbce41b372c17409f0e9.tar nixlib-6bbc3a0b245ccf392a8ddbce41b372c17409f0e9.tar.gz nixlib-6bbc3a0b245ccf392a8ddbce41b372c17409f0e9.tar.bz2 nixlib-6bbc3a0b245ccf392a8ddbce41b372c17409f0e9.tar.lz nixlib-6bbc3a0b245ccf392a8ddbce41b372c17409f0e9.tar.xz nixlib-6bbc3a0b245ccf392a8ddbce41b372c17409f0e9.tar.zst nixlib-6bbc3a0b245ccf392a8ddbce41b372c17409f0e9.zip | |
Merge commit '3b29468313bc8604fe8f85c8d9316fd276d3985c' into HEAD
Diffstat (limited to 'pkgs/shells/bash')
| -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" |