oh-my-fish: fix some egregious errors
This commit is contained in:
parent
9bb2ef1532
commit
fa844907f3
|
@ -2,26 +2,24 @@
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fish
|
, fish
|
||||||
, bash
|
|
||||||
, runtimeShell
|
, runtimeShell
|
||||||
, writeShellScript
|
, writeShellScript
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "oh-my-fish";
|
pname = "oh-my-fish";
|
||||||
version = "7+unstable=2021-03-03";
|
version = "unstable-2022-03-27";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = finalAttrs.pname;
|
||||||
repo = pname;
|
repo = finalAttrs.pname;
|
||||||
rev = "0b1396ad7962073fa25615bf03c43b53eddc2d56";
|
rev = "d428b723c8c18fef3b2a00b8b8b731177f483ad8";
|
||||||
hash = "sha256-lwMo4+PcYR9kYJPWK+ALiMfBdxFSgB2vjtSn8QrmmEA=";
|
hash = "sha256-msItKEPe7uSUpDAfCfdYZjt5NyfM3KtOrLUTO9NGqlg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
fish
|
fish
|
||||||
bash
|
|
||||||
];
|
];
|
||||||
|
|
||||||
dontConfigure = true;
|
dontConfigure = true;
|
||||||
|
@ -30,21 +28,21 @@ stdenv.mkDerivation rec {
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
|
|
||||||
mkdir -pv $out/bin $out/share/${pname}
|
mkdir -pv $out/bin $out/share/${finalAttrs.pname}
|
||||||
cp -vr * $out/share/${pname}
|
cp -vr * $out/share/${finalAttrs.pname}
|
||||||
|
|
||||||
cat << EOF > $out/bin/omf-install
|
cat << EOF > $out/bin/omf-install
|
||||||
#!${runtimeShell}
|
#!${runtimeShell}
|
||||||
|
|
||||||
${fish}/bin/fish \\
|
${fish}/bin/fish \\
|
||||||
$out/share/${pname}/bin/install \\
|
$out/share/${finalAttrs.pname}/bin/install \\
|
||||||
--noninteractive \\
|
--noninteractive \\
|
||||||
--offline=$out/share/${pname}
|
--offline=$out/share/${finalAttrs.pname}
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
chmod +x $out/bin/omf-install
|
chmod +x $out/bin/omf-install
|
||||||
|
|
||||||
runHook PostInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
@ -60,5 +58,5 @@ stdenv.mkDerivation rec {
|
||||||
mainProgram = "omf-install";
|
mainProgram = "omf-install";
|
||||||
platforms = fish.meta.platforms;
|
platforms = fish.meta.platforms;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
# TODO: customize the omf-install script
|
# TODO: customize the omf-install script
|
||||||
|
|
Loading…
Reference in a new issue