Commit 10f01ded authored by Luigi Sartor Piucco's avatar Luigi Sartor Piucco Committed by John Titor
Browse files

zsh plugins: use omz-compatible paths 

The `programs.zsh.ohMyZsh.customPkgs` option expects that arguments
passed to it will have a zsh plugin/theme/completion in a path like
`$out/share/zsh/{plugins,themes,completions}`, and copies whatever is
inside those to `$ZSH_CUSTOM`.

However, some packages actually unpacked to `$out/share`, without the
proper folder structure, so they never got copied to `$ZSH_CUSTOM` and
caused "not found" errors on zsh startup.

This commit fixes that, and maintains compatibility with other packages
that might still expect a flattened structure. This is done though a
symlink.
parent d8cc1036

pkgs/by-name/zs/zsh-autosuggestions/package.nix

+5 −1
Original line number Diff line number Diff line
@@ -20,8 +20,12 @@ stdenv.mkDerivation rec { 
  strictDeps = true;



  installPhase = ''

    install -D zsh-autosuggestions.plugin.zsh \

      $out/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh

    install -D zsh-autosuggestions.zsh \

      $out/share/zsh-autosuggestions/zsh-autosuggestions.zsh

      $out/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh

    ln -s $out/share/zsh/plugins/zsh-autosuggestions \

      $out/share/zsh-autosuggestions

  '';



  meta = with lib; {

pkgs/by-name/zs/zsh-bd/package.nix

+10 −4
Original line number Diff line number Diff line
@@ -19,10 +19,16 @@ stdenv.mkDerivation { 
  dontBuild = true;



  installPhase = ''

    mkdir -p $out/share/zsh-bd

    cp {.,$out/share/zsh-bd}/bd.zsh

    cd $out/share/zsh-bd

    ln -s bd{,.plugin}.zsh

    runHook preInstall



    install -D bd.zsh \

      $out/share/plugins/zsh-bd/bd.zsh

    ln -s $out/share/plugins/zsh-bd/bd.zsh \

      $out/share/plugins/zsh-bd/bd.plugin.zsh

    ln -s $out/share/plugins/zsh-bd \

      $out/share/zsh-bd



    runHook postInstall

  '';



  meta = {

pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec { 
  dontBuild = true;



  installPhase = ''

    plugindir="$out/share/zsh/site-functions"

    plugindir="$out/share/zsh/plugins/fast-syntax-highlighting"



    mkdir -p "$plugindir"

    cp -r -- {,_,-,.}fast-* *chroma themes "$plugindir"/

pkgs/by-name/zs/zsh-history-substring-search/package.nix

+5 −1
Original line number Diff line number Diff line
@@ -17,8 +17,12 @@ stdenv.mkDerivation rec { 


  strictDeps = true;

  installPhase = ''

    install -D zsh-history-substring-search.plugin.zsh \

      "$out/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.plugin.zsh"

    install -D zsh-history-substring-search.zsh \

      "$out/share/zsh-history-substring-search/zsh-history-substring-search.zsh"

      "$out/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh"

    ln -s $out/share/zsh/plugins/zsh-history-substring-search \

      $out/share/zsh-history-substring-search

  '';



  meta = with lib; {

pkgs/by-name/zs/zsh-nix-shell/package.nix

+3 −2
Original line number Diff line number Diff line
@@ -22,8 +22,9 @@ stdenv.mkDerivation rec { 
  strictDeps = true;

  buildInputs = [ bash ];

  installPhase = ''

    install -D nix-shell.plugin.zsh --target-directory=$out/share/zsh-nix-shell

    install -D scripts/* --target-directory=$out/share/zsh-nix-shell/scripts

    install -D nix-shell.plugin.zsh --target-directory=$out/share/zsh/plugins/zsh-nix-shell

    install -D scripts/* --target-directory=$out/share/zsh/plugins/zsh-nix-shell/scripts

    ln -s $out/share/zsh/plugins/zsh-nix-shell $out/share/zsh-nix-shell

  '';



  meta = with lib; {