Merge staging-next into staging

2020-01-15 09:23:28 +01:00
parent c1d011a689 7119d07624
commit 2a88c3c302
163 changed files with 2986 additions and 913 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 "1i GITSTATUS_DAEMON=$out/bin/gitstatusd" gitstatus.plugin.zsh
  '';
  installPhase = ''
    install -Dm755 gitstatusd $out/bin/gitstatusd