diff options
| author | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-07-06 22:46:29 -0300 |
|---|---|---|
| committer | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-07-06 22:50:17 -0300 |
| commit | fa844907f3452344b021077e110b34d547f18309 (patch) | |
| tree | 398423d096629bfafc47180839e1400c077ffc5d /pkgs/shells/fish | |
| parent | 9bb2ef1532cbfbff259f84b6cbd3749d24344dd6 (diff) | |
| download | nixlib-fa844907f3452344b021077e110b34d547f18309.tar nixlib-fa844907f3452344b021077e110b34d547f18309.tar.gz nixlib-fa844907f3452344b021077e110b34d547f18309.tar.bz2 nixlib-fa844907f3452344b021077e110b34d547f18309.tar.lz nixlib-fa844907f3452344b021077e110b34d547f18309.tar.xz nixlib-fa844907f3452344b021077e110b34d547f18309.tar.zst nixlib-fa844907f3452344b021077e110b34d547f18309.zip | |
oh-my-fish: fix some egregious errors
Diffstat (limited to 'pkgs/shells/fish')
| -rw-r--r-- | pkgs/shells/fish/oh-my-fish/default.nix | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/pkgs/shells/fish/oh-my-fish/default.nix b/pkgs/shells/fish/oh-my-fish/default.nix index 252e9350eaf1..6c09599972d1 100644 --- a/pkgs/shells/fish/oh-my-fish/default.nix +++ b/pkgs/shells/fish/oh-my-fish/default.nix @@ -2,26 +2,24 @@ , stdenv , fetchFromGitHub , fish -, bash , runtimeShell , writeShellScript }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "oh-my-fish"; - version = "7+unstable=2021-03-03"; + version = "unstable-2022-03-27"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "0b1396ad7962073fa25615bf03c43b53eddc2d56"; - hash = "sha256-lwMo4+PcYR9kYJPWK+ALiMfBdxFSgB2vjtSn8QrmmEA="; + owner = finalAttrs.pname; + repo = finalAttrs.pname; + rev = "d428b723c8c18fef3b2a00b8b8b731177f483ad8"; + hash = "sha256-msItKEPe7uSUpDAfCfdYZjt5NyfM3KtOrLUTO9NGqlg="; }; strictDeps = true; buildInputs = [ fish - bash ]; dontConfigure = true; @@ -30,21 +28,21 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -pv $out/bin $out/share/${pname} - cp -vr * $out/share/${pname} + mkdir -pv $out/bin $out/share/${finalAttrs.pname} + cp -vr * $out/share/${finalAttrs.pname} cat << EOF > $out/bin/omf-install #!${runtimeShell} ${fish}/bin/fish \\ - $out/share/${pname}/bin/install \\ + $out/share/${finalAttrs.pname}/bin/install \\ --noninteractive \\ - --offline=$out/share/${pname} + --offline=$out/share/${finalAttrs.pname} EOF chmod +x $out/bin/omf-install - runHook PostInstall + runHook postInstall ''; meta = with lib; { @@ -60,5 +58,5 @@ stdenv.mkDerivation rec { mainProgram = "omf-install"; platforms = fish.meta.platforms; }; -} +}) # TODO: customize the omf-install script |