diff options
| author | Olli Helenius <liff@iki.fi> | 2023-12-14 21:06:17 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-12-15 15:58:37 +0000 |
| commit | f58ff70d70fdccea32e18978594c09604ae67c9f (patch) | |
| tree | 9540bd71b536c97c99e9531454ee85c0c01f12bb /pkgs/applications/networking/instant-messengers/signald | |
| parent | b40a39cc8ff69da3983f053e01ca97f0a609faea (diff) | |
signald: build with jdk17
(cherry picked from commit 5f8f3c1250888834410e034c6b5c03ec45821caf)
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/signald')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/signald/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index b15dbbb92bdb2..2f362a4942c92 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -16,6 +16,8 @@ let sha256 = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA="; }; + gradleWithJdk = gradle.override { java = jdk17_headless; }; + jre' = jre_minimal.override { jdk = jdk17_headless; # from https://gitlab.com/signald/signald/-/blob/0.23.0/build.gradle#L173 @@ -39,7 +41,7 @@ let deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit src version; - nativeBuildInputs = [ gradle perl ]; + nativeBuildInputs = [ gradleWithJdk perl ]; patches = [ ./0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -118,7 +120,7 @@ in stdenv.mkDerivation { runHook postInstall ''; - nativeBuildInputs = [ git gradle makeWrapper ]; + nativeBuildInputs = [ git gradleWithJdk makeWrapper ]; doCheck = true; |