Unverified Commit 9ecb3b8e authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #202905 from dotlambda/signald-gradle_7

signald: use Gradle 7
parents 5dc7114b 2199a08f
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle_6, git, perl
{ lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle, git, perl
, makeWrapper, fetchpatch, substituteAll, jre_minimal
}:

@@ -36,7 +36,7 @@ let
  deps = stdenv.mkDerivation {
    pname = "${pname}-deps";
    inherit src version;
    nativeBuildInputs = [ gradle_6 perl ];
    nativeBuildInputs = [ gradle perl ];
    patches = [ ./0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch ];
    buildPhase = ''
      export GRADLE_USER_HOME=$(mktemp -d)
@@ -91,7 +91,7 @@ in stdenv.mkDerivation rec {
    runHook postInstall
  '';

  nativeBuildInputs = [ git gradle_6 makeWrapper ];
  nativeBuildInputs = [ git gradle makeWrapper ];

  doCheck = true;