Merge remote-tracking branch 'upstream/staging-next' into HEAD

2021-02-09 10:54:55 +01:00
parent 031fc22851 bf5cc63b6c
commit 6eeba550e9
104 changed files with 541 additions and 708 deletions
--- a/pkgs/shells/zsh/zsh-prezto/default.nix
+++ b/pkgs/shells/zsh/zsh-prezto/default.nix
@@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
    fetchSubmodules = true;
  };

+  postPatch = ''
+    # make zshrc aware of where zsh-prezto is installed
+    sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/share/zsh-prezto/|g" runcoms/zshrc
+  '';
+
  installPhase = ''
    mkdir -p $out/share/zsh-prezto
    cp -R ./ $out/share/zsh-prezto