Merge pull request #326036 from spitulax/odinfmt

ols: include `odinfmt` in derivation
This commit is contained in:
Thiago Kenji Okada 2024-07-12 16:40:31 +01:00 committed by GitHub
commit e505595836
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation {
};
postPatch = ''
patchShebangs build.sh
patchShebangs build.sh odinfmt.sh
'';
nativeBuildInputs = [ makeBinaryWrapper ];
@ -29,7 +29,7 @@ stdenv.mkDerivation {
buildPhase = ''
runHook preBuild
./build.sh
./build.sh && ./odinfmt.sh
runHook postBuild
'';
@ -37,7 +37,7 @@ stdenv.mkDerivation {
installPhase = ''
runHook preInstall
install -Dm755 ols -t $out/bin/
install -Dm755 ols odinfmt -t $out/bin/
wrapProgram $out/bin/ols --set-default ODIN_ROOT ${odin}/share
runHook postInstall