nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 07:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #274279 from liff/signald-gradle-java17

Browse Source 
signald: build with jdk17
This commit is contained in:
Maximilian Bosch 2023-12-14 21:07:04 +01:00 committed by GitHub
commit 5c1d2b0d06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/instant-messengers/signald/default.nix
View File

@ -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;