marytts: use Gradle 8

Part of #358845.

 Inlined from https://github.com/marytts/marytts/pull/1120
This commit is contained in:
Tomodachi94 2025-08-02 02:41:00 +00:00
parent e07c1ba3ce
commit 5d8ad491d5
2 changed files with 39 additions and 5 deletions

View File

@ -0,0 +1,28 @@
From 5cda42b687a2271f5be52466c39d18e974beaa30 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Sun, 20 Apr 2025 02:22:16 +0000
Subject: [PATCH] gradle(installDist): explicitly depend on
installerGuiStartScripts
This allows us to use Gradle 8.
Closes #1112
---
applicationLogic.gradle | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/applicationLogic.gradle b/applicationLogic.gradle
index 0d4a4c7dc..a4f6a571c 100644
--- a/applicationLogic.gradle
+++ b/applicationLogic.gradle
@@ -129,6 +129,10 @@ def testStartScriptsTask = tasks.register('testStartScripts') {
}
}
+tasks.named('installDist') {
+ dependsOn tasks.named('installerGuiStartScripts')
+}
+
tasks.named('check') {
dependsOn testStartScriptsTask
}

View File

@ -2,9 +2,8 @@
lib,
stdenvNoCC,
fetchFromGitHub,
# Gradle 8 complains about implicit task dependencies when using `installDist`.
# See https://github.com/marytts/marytts/issues/1112
gradle_7,
# "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
gradle_8,
makeWrapper,
jdk,
nixosTests,
@ -20,12 +19,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
hash = "sha256-jGpsD6IwJ67nDLnulBn8DycXCyowssSnDCkQXBIfOH8=";
};
patches = [
# Gradle 8 complains about implicit task dependencies when using `installDist`,
# so let's patch it.
# See https://github.com/marytts/marytts/issues/1112
./gradle-8.patch
];
nativeBuildInputs = [
gradle_7
gradle_8
makeWrapper
];
mitmCache = gradle_7.fetchDeps {
mitmCache = gradle_8.fetchDeps {
inherit (finalAttrs) pname;
data = ./deps.json;
};