Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

basil: remove jre/jdk override #26

Merged
merged 1 commit into from
Dec 7, 2024
Merged

basil: remove jre/jdk override #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions basil/basil.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
, fetchFromGitHub
, mkSbtDerivation
, makeBinaryWrapper
, jdk
, jre
, sbt
, jdk17
, testers
, basil
, protobuf
Expand All @@ -14,12 +14,13 @@ let
substituteInPlace build.sbt \
--replace-fail 'PROTOC_PLACEHOLDER' '${lib.getExe protobuf}'
'';
mkSbtDerivation' = mkSbtDerivation.withOverrides { sbt = sbt.override { jre = jdk17; }; };
in
mkSbtDerivation {
mkSbtDerivation' {
pname = "basil";
version = "0.1.2-alpha-unstable-2024-11-13";

nativeBuildInputs = [ jdk makeBinaryWrapper ];
nativeBuildInputs = [ makeBinaryWrapper ];

src = fetchFromGitHub {
owner = "UQ-PAC";
Expand All @@ -42,7 +43,6 @@ mkSbtDerivation {
buildPhase = ''
runHook preBuild

javac -version
sbt assembly

runHook postBuild
Expand All @@ -66,7 +66,7 @@ mkSbtDerivation {
cp -v "$JAR" $out/share/basil/$(basename $JAR)

# make wrapper to run jar with appropriate arguments
makeWrapper "${lib.getExe jre}" $out/bin/basil \
makeWrapper "${lib.getExe jdk17}" $out/bin/basil \
--add-flags -jar \
--add-flags "$out/share/basil/$(basename $JAR)"

Expand Down
3 changes: 0 additions & 3 deletions basil/overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ let
compiler-explorer = (prev.callPackage ./compiler-explorer.nix { });
godbolt = (prev.callPackage ./godbolt.nix { });
basil-tool = prev.callPackage ./basil-tool.nix { };

jre = final.temurin-jre-bin-17;
jdk = final.temurin-bin-17;
};
in
final: prev:
Expand Down
Loading