mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
oh-my-fish: fix some egregious errors
This commit is contained in:
parent
9bb2ef1532
commit
fa844907f3
1 changed files with 12 additions and 14 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue