diff options
| author | Robin Gloster <mail@glob.in> | 2016-02-07 11:17:57 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-02-07 11:17:57 +0000 |
| commit | 9229e9c6563d88f1b9413ce128e022921089413f (patch) | |
| tree | cc1ce2eda51dd7cebe7a75e342cfcaf88c45e2f5 /pkgs/shells | |
| parent | 051662610104c2c57b89783084b9f31f5e978c71 (diff) | |
| parent | 6205f17ea43fd74e4aff14a24a5734ec33415fd7 (diff) | |
| download | nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.gz nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.bz2 nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.lz nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.xz nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.zst nixlib-9229e9c6563d88f1b9413ce128e022921089413f.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 1419b180d728..11eeb18661c0 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -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" |