From 6984a7201cbae604cb6fb9e7bb6f39c5dd3278c5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 10 Jul 2023 18:30:19 +0300 Subject: [PATCH] zsh: enable function subdirs and patch script shebangs --- pkgs/shells/zsh/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 890817dd4077..1297e622269f 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation { "--enable-pcre" "--enable-zshenv=${placeholder "out"}/etc/zshenv" "--disable-site-fndir" + "--enable-function-subdirs" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && !stdenv.hostPlatform.isStatic) [ # Also see: https://github.com/buildroot/buildroot/commit/2f32e668aa880c2d4a2cce6c789b7ca7ed6221ba "zsh_cv_shared_environ=yes" @@ -112,6 +113,10 @@ EOF ''; # XXX: patch zsh to take zwc if newer _or equal_ + postFixup = '' + HOST_PATH=$out/bin:$HOST_PATH patchShebangs --host $out/share/zsh/*/functions + ''; + meta = { description = "The Z shell"; longDescription = ''