Merge master into staging-next

2020-01-02 21:41:13 +01:00
parent bdfb1bd01b 129c73802f
commit f08e3e38d4
118 changed files with 2412 additions and 2737 deletions
@@ -13,7 +13,7 @@ stdenv.mkDerivation {

  buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];
  patchPhase = ''
-    sed -i "s|local daemon.*|local daemon=$out/bin/gitstatusd|" gitstatus.plugin.zsh
+    sed -i "s|local daemon=.*|local daemon=$out/bin/gitstatusd|" gitstatus.plugin.zsh
  '';
  installPhase = ''
    install -Dm755 gitstatusd $out/bin/gitstatusd