Merge pull request #136614 from symphorien/zsh-tz-completion

zsh: fix TZ= completion
launchpad/nixpkgs/master
Timothy DeHerrera 3 years ago committed by GitHub
commit 5fe504bf2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      pkgs/shells/zsh/default.nix
  2. 14
      pkgs/shells/zsh/tz_completion.patch

@ -18,6 +18,11 @@ stdenv.mkDerivation {
sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w";
};
patches = [
# fix location of timezone data for TZ= completion
./tz_completion.patch
];
buildInputs = [ ncurses pcre ];
configureFlags = [

@ -0,0 +1,14 @@
On NixOS, timezone data is located at /etc/zoneinfo
diff --git a/Completion/Unix/Type/_time_zone b/Completion/Unix/Type/_time_zone
index cd924bbc7..5d683291b 100644
--- a/Completion/Unix/Type/_time_zone
+++ b/Completion/Unix/Type/_time_zone
@@ -3,7 +3,7 @@
local expl
if (( ! $+_zoneinfo_dirs )); then
- _zoneinfo_dirs=( /usr/{share,lib,share/lib}/{zoneinfo*,locale/TZ}(/) )
+ _zoneinfo_dirs=( /etc/zoneinfo /usr/{share,lib,share/lib}/{zoneinfo*,locale/TZ}(/) )
fi
_wanted time-zones expl 'time zone' _files -W _zoneinfo_dirs "$@" -
Loading…
Cancel
Save