Merge pull request #43282 from Ma27/support-external-zsh-plugins

nixos/ohMyZsh: allow multiple derivations in `ZSH_CUSTOM`

2 files changed, 13 insertions, 8 deletions

diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
index 6dea51a487e9..c4d63bd27710 100644
--- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
+++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, zsh }:
 
 stdenv.mkDerivation {
   name = "lambda-mod-zsh-theme-unstable-2017-10-08";
@@ -10,9 +10,13 @@ stdenv.mkDerivation {
     rev = "61c373c8aa5556d51522290b82ad44e7166bced1";
   };
 
+  buildInputs = [ zsh ];
+
   installPhase = ''
-    mkdir -p $out/share/themes
-    cp lambda-mod.zsh-theme $out/share/themes
+    chmod +x lambda-mod.zsh-theme # only executable scripts are found by `patchShebangs`
+    patchShebangs .
+
+    install -Dm0644 lambda-mod.zsh-theme $out/share/zsh/themes/lambda-mod.zsh-theme
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix
index 3c4c3fabfd10..4405902ec3e0 100644
--- a/pkgs/shells/zsh/nix-zsh-completions/default.nix
+++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix
@@ -15,15 +15,16 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    mkdir -p $out/share/zsh/site-functions
+    mkdir -p $out/share/zsh/{site-functions,plugins/nix}
     cp _* $out/share/zsh/site-functions
+    cp *.zsh $out/share/zsh/plugins/nix
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/spwhitt/nix-zsh-completions;
     description = "ZSH completions for Nix, NixOS, and NixOps";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.spwhitt stdenv.lib.maintainers.olejorgenb stdenv.lib.maintainers.hedning ];
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ spwhitt olejorgenb hedning ma27 ];
   };
 }