about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPascal Wittmann <mail@pascal-wittmann.de>2019-01-29 16:05:05 +0100
committerGitHub <noreply@github.com>2019-01-29 16:05:05 +0100
commit3c6d358158137394b9567f680ed58edc4243b917 (patch)
tree2c658121311aae8acedf7eb410a1682a498fd4a5 /pkgs
parent851dae4ec9d6570e1b7343555653551da8f33d30 (diff)
parent40296f7c18bd3fe96b50eccc50f8f175e2dc71ef (diff)
downloadnixlib-3c6d358158137394b9567f680ed58edc4243b917.tar
nixlib-3c6d358158137394b9567f680ed58edc4243b917.tar.gz
nixlib-3c6d358158137394b9567f680ed58edc4243b917.tar.bz2
nixlib-3c6d358158137394b9567f680ed58edc4243b917.tar.lz
nixlib-3c6d358158137394b9567f680ed58edc4243b917.tar.xz
nixlib-3c6d358158137394b9567f680ed58edc4243b917.tar.zst
nixlib-3c6d358158137394b9567f680ed58edc4243b917.zip
Merge pull request #54831 from ptrhlm/master
zsh: fix for infinite recursion in VCS_INFO_detect_p4
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/shells/zsh/default.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 46d8375fb6bf..86f499b4b564 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -18,6 +18,15 @@ stdenv.mkDerivation {
     sha256 = "04ynid3ggvy6i5c26bk52mq6x5vyrdwgryid9hggmnb1nf8b41vq";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "vcs_info.patch";
+      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vcs_info.patch?h=packages/zsh&id=1b7537ff5343819b3110a76bbdd2a1bf9ef80c4a";
+      sha256 = "0rc63cdc0qzhmj2dp5jnmxgyl5c47w857s8379fq36z8g0bi3rwq";
+      excludes = [ "ChangeLog" ];
+    })
+  ];
+
   buildInputs = [ ncurses pcre ];
 
   configureFlags = [