diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-24 10:07:29 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-24 10:07:29 +0200 |
| commit | 3472b61f371da6b38928f72e8def2809b86aab91 (patch) | |
| tree | 7ce0f8e36a12cfd7183b3261fbc1cb5fb4167c48 /pkgs/shells/fish | |
| parent | b9df4311dc1f50253ec86be6b7908fa620070ffd (diff) | |
| download | nixpkgs-3472b61f371da6b38928f72e8def2809b86aab91.tar nixpkgs-3472b61f371da6b38928f72e8def2809b86aab91.tar.gz nixpkgs-3472b61f371da6b38928f72e8def2809b86aab91.tar.bz2 nixpkgs-3472b61f371da6b38928f72e8def2809b86aab91.tar.lz nixpkgs-3472b61f371da6b38928f72e8def2809b86aab91.tar.xz nixpkgs-3472b61f371da6b38928f72e8def2809b86aab91.tar.zst nixpkgs-3472b61f371da6b38928f72e8def2809b86aab91.zip | |
fish: use a different alias man_db -> man-db
Diffstat (limited to 'pkgs/shells/fish')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 8916cca0f04..6de8aa7f18b 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, nettools, python, which, groff, gettext, man_db, +{ stdenv, fetchurl, ncurses, nettools, python, which, groff, gettext, man-db, bc, libiconv, coreutils, gnused, kbd, utillinux, glibc }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # Required binaries during execution # Python: Autocompletion generated from manpages and config editing propagatedBuildInputs = [ python which groff gettext ] - ++ stdenv.lib.optional (!stdenv.isDarwin) man_db + ++ stdenv.lib.optional (!stdenv.isDarwin) man-db ++ [ bc coreutils ]; postInstall = '' @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { done '' + 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|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" |