Merge pull request #209307 from deejayem/zsh-forgit-23.01.0

This commit is contained in:
Sandro 2023-01-10 13:20:00 +01:00 committed by GitHub
commit 79562c9aa1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,14 +1,25 @@
{ stdenv, lib, bash, fetchFromGitHub, makeWrapper, fzf, git }:
{ stdenv
, lib
, bash
, coreutils
, findutils
, fetchFromGitHub
, fzf
, git
, gnugrep
, gnused
, makeWrapper
}:
stdenv.mkDerivation rec {
pname = "zsh-forgit";
version = "22.12.0";
version = "23.01.0";
src = fetchFromGitHub {
owner = "wfxr";
repo = "forgit";
rev = version;
sha256 = "0juBNUJW4SU3Cl6ouD+xMYzlCJOL7NAYpueZ6V56/ck=";
sha256 = "sha256-guAjxFhtybbRyRRXDELDHrM2Xzmi96wPxD2nhL9Ifmk=";
};
strictDeps = true;
@ -16,9 +27,6 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace forgit.plugin.zsh \
--replace "\$INSTALL_DIR/bin/git-forgit" "$out/bin/git-forgit"
substituteInPlace bin/git-forgit \
--replace "/bin/bash" "${bash}/bin/bash"
'';
dontBuild = true;
@ -31,7 +39,7 @@ stdenv.mkDerivation rec {
install -D bin/git-forgit $out/bin/git-forgit
install -D forgit.plugin.zsh $out/share/zsh/${pname}/forgit.plugin.zsh
wrapProgram $out/bin/git-forgit \
--prefix PATH : ${lib.makeBinPath [ fzf git ]}
--prefix PATH : ${lib.makeBinPath [ bash coreutils findutils fzf git gnugrep gnused ]}
runHook postInstall
'';