diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-07-12 16:26:49 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-08-11 21:32:55 +0300 |
| commit | bd0e161f0cd6a34a5fa777570b1489f1275af417 (patch) | |
| tree | c37d3985b3624cc41a7208924bcd5db29281076e /pkgs/shells/bash | |
| parent | 81c360d94833815c686d99c84bd0581a27349ac4 (diff) | |
| download | nixpkgs-bd0e161f0cd6a34a5fa777570b1489f1275af417.tar nixpkgs-bd0e161f0cd6a34a5fa777570b1489f1275af417.tar.gz nixpkgs-bd0e161f0cd6a34a5fa777570b1489f1275af417.tar.bz2 nixpkgs-bd0e161f0cd6a34a5fa777570b1489f1275af417.tar.lz nixpkgs-bd0e161f0cd6a34a5fa777570b1489f1275af417.tar.xz nixpkgs-bd0e161f0cd6a34a5fa777570b1489f1275af417.tar.zst nixpkgs-bd0e161f0cd6a34a5fa777570b1489f1275af417.zip | |
bashInteractive: Fix manpages since previous commits
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 cf7fe35d5f3..b4a2ba55388 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" "man" "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" |