diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-02-01 11:18:39 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-03-08 11:35:24 -0600 |
commit | da972b6cc40b4be7492df1661a522e12bf747807 (patch) | |
tree | 614d4a8ebab431784816f13ee042041482f1cbf8 /pkgs/shells/fish | |
parent | 3ef7671cea0ed5a4819e1cd83c03f4ee1f85eb96 (diff) | |
download | nixpkgs-da972b6cc40b4be7492df1661a522e12bf747807.tar nixpkgs-da972b6cc40b4be7492df1661a522e12bf747807.tar.gz nixpkgs-da972b6cc40b4be7492df1661a522e12bf747807.tar.bz2 nixpkgs-da972b6cc40b4be7492df1661a522e12bf747807.tar.lz nixpkgs-da972b6cc40b4be7492df1661a522e12bf747807.tar.xz nixpkgs-da972b6cc40b4be7492df1661a522e12bf747807.tar.zst nixpkgs-da972b6cc40b4be7492df1661a522e12bf747807.zip |
ncurses: move runtime utilities to $out
All the programs provided by ncurses were being installed to the $dev output, but several of them are intended for runtime use, e.g. to operate on the running terminal. These user-facing programs are moved to the $bin output. Several packages referred to "${ncurses}/bin" or "${ncurses.dev}/bin" at runtime; these paths are also updated to refer to "${ncurses.bin}/bin".
Diffstat (limited to 'pkgs/shells/fish')
-rw-r--r-- | pkgs/shells/fish/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 52121294067..5dcf61a5556 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { -i "$out/share/fish/functions/alias.fish" \ "$out/share/fish/functions/prompt_pwd.fish" substituteInPlace "$out/share/fish/functions/fish_default_key_bindings.fish" \ - --replace "clear;" "${ncurses}/bin/clear;" + --replace "clear;" "${ncurses.out}/bin/clear;" '' + stdenv.lib.optionalString stdenv.isLinux '' substituteInPlace "$out/share/fish/functions/__fish_print_help.fish" \ --replace "| ul" "| ${utillinux}/bin/ul" |