colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fish: use a different alias man_db -> man-db

Browse Source
This commit is contained in:
Vladimír Čunát 2016-05-24 10:07:29 +02:00
parent b9df4311dc
commit 3472b61f37
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/shells/fish/default.nix
View File

@ -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"