diff options
| author | r-vdp <ramses@well-founded.dev> | 2023-10-19 08:40:56 +0200 |
|---|---|---|
| committer | r-vdp <ramses@well-founded.dev> | 2023-10-19 08:40:56 +0200 |
| commit | 97e3336a5b3690c915981f3cfad34d1c9061eb5d (patch) | |
| tree | 1a527925641af8987fbe384b968a0caa921d8a4c /pkgs/shells/fish | |
| parent | 458ef9126aa380996d77d44f53f886c2d8485f53 (diff) | |
| download | nixpkgs-97e3336a5b3690c915981f3cfad34d1c9061eb5d.tar nixpkgs-97e3336a5b3690c915981f3cfad34d1c9061eb5d.tar.gz nixpkgs-97e3336a5b3690c915981f3cfad34d1c9061eb5d.tar.bz2 nixpkgs-97e3336a5b3690c915981f3cfad34d1c9061eb5d.tar.lz nixpkgs-97e3336a5b3690c915981f3cfad34d1c9061eb5d.tar.xz nixpkgs-97e3336a5b3690c915981f3cfad34d1c9061eb5d.tar.zst nixpkgs-97e3336a5b3690c915981f3cfad34d1c9061eb5d.zip | |
fish: use the subcommand style for the status command
The flag style has been deprecated and will eventually be removed.
Diffstat (limited to 'pkgs/shells/fish')
| -rw-r--r-- | pkgs/shells/fish/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/shells/fish/wrapper.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 4df95a9ca6f..bd816f9a899 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -79,7 +79,7 @@ let # note that this is required: # 1. For all shells, not just login shells (mosh needs this as do some other command-line utilities) # 2. Before the shell is initialized, so that config snippets can find the commands they use on the PATH - builtin status --is-login + builtin status is-login or test -z "$__fish_nixos_env_preinit_sourced" -a -z "$ETC_PROFILE_SOURCED" -a -z "$ETC_ZSHENV_SOURCED" ${if fishEnvPreInit != null then '' and begin diff --git a/pkgs/shells/fish/wrapper.nix b/pkgs/shells/fish/wrapper.nix index 75213809821..62ae03ec9ef 100644 --- a/pkgs/shells/fish/wrapper.nix +++ b/pkgs/shells/fish/wrapper.nix @@ -18,7 +18,7 @@ let name = "wrapfish.aliases.fish"; destination = "/share/fish/vendor_conf.d/aliases.fish"; text = '' - status --is-interactive; and begin + status is-interactive; and begin # Aliases ${aliasesStr} end |