Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-02-07 11:17:57 +00:00
parent 0516626101 6205f17ea4
commit 9229e9c656
469 changed files with 23339 additions and 14678 deletions
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
    sed -i "s|(hostname\||(${nettools}/bin/hostname\||" "$out/share/fish/functions/fish_prompt.fish"
    sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py"
+    sed -i "s|command manpath|command ${man_db}/bin/manpath|" "$out/share/fish/functions/man.fish"
  '' + ''
    sed -i "s|/sbin /usr/sbin||" \
           "$out/share/fish/functions/__fish_complete_subcommand_root.fish"