aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorquapka2025-06-21 15:19:36 +0200
committerquapka2025-06-21 15:19:36 +0200
commitdc4dd14faf1af0676003c1dc6e31fff5a05342cb (patch)
tree0405056a663317920056c0bb4e7ca6f73a661808
parentab6363f6cb92b3de9015f665bea6f87e2be7fb4c (diff)
downloadECTester-dc4dd14faf1af0676003c1dc6e31fff5a05342cb.tar.gz
ECTester-dc4dd14faf1af0676003c1dc6e31fff5a05342cb.tar.zst
ECTester-dc4dd14faf1af0676003c1dc6e31fff5a05342cb.zip
-rw-r--r--flake.nix16
1 files changed, 6 insertions, 10 deletions
diff --git a/flake.nix b/flake.nix
index ac41b2d..446c495 100644
--- a/flake.nix
+++ b/flake.nix
@@ -690,10 +690,10 @@
);
buildReader =
+ with pkgs;
{
- jdkVersion ? pkgs.jdk17_headless,
+ jdkVersion ? jdk17_headless,
}:
- with pkgs;
gradle2nix.builders.${system}.buildGradlePackage rec {
pname = "ECTesterReader";
version = "0.3.3";
@@ -717,10 +717,10 @@
};
buildApplet =
+ with pkgs;
{
- jdkVersion ? pkgs.jdk8_headless,
+ jdkVersion ? jdk8_headless,
}:
- with pkgs;
gradle2nix.builders.${system}.buildGradlePackage rec {
pname = "applet";
# since the gradle target builds applets for multiple JC SDKs, the
@@ -735,15 +735,13 @@
mkdir --parents $out
cp --recursive applet/build/* $out
'';
-
- nativeBuildInputs = [ makeWrapper ];
};
buildCommon =
+ with pkgs;
{
- jdkVersion ? pkgs.jdk17_headless,
+ jdkVersion ? jdk17_headless,
}:
- with pkgs;
gradle2nix.builders.${system}.buildGradlePackage rec {
pname = "common";
version = "0.3.3";
@@ -756,8 +754,6 @@
mkdir --parents $out
cp --recursive common/build/* $out
'';
-
- nativeBuildInputs = [ makeWrapper ];
};
defaultVersion =