Merge pull request #238718 from wegank/forge-mtg-mavenfod

forge-mtg: convert to mavenfod

2 files changed, 12 insertions, 42 deletions

diff --git a/pkgs/development/java-modules/maven-fod.nix b/pkgs/development/java-modules/maven-fod.nix
index 8f56c4aa9b3..753db956dfe 100644
--- a/pkgs/development/java-modules/maven-fod.nix
+++ b/pkgs/development/java-modules/maven-fod.nix
@@ -20,9 +20,9 @@
 stdenv.mkDerivation (rec {
   fetchedMavenDeps = stdenv.mkDerivation ({
     name = "${pname}-${version}-maven-deps";
-    inherit src;
+    inherit src patches;
 
-    buildInputs = [
+    nativeBuildInputs = [
       maven
     ];
 
@@ -32,10 +32,10 @@ stdenv.mkDerivation (rec {
 
     # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
     installPhase = ''
-      find $out -type f \
-        -name \*.lastUpdated -or \
-        -name resolver-status.properties -or \
-        -name _remote.repositories \
+      find $out -type f \( \
+        -name \*.lastUpdated \
+        -o -name resolver-status.properties \
+        -o -name _remote.repositories \) \
         -delete
     '';
 
diff --git a/pkgs/games/forge-mtg/default.nix b/pkgs/games/forge-mtg/default.nix
index 134d3721581..bc59764e8aa 100644
--- a/pkgs/games/forge-mtg/default.nix
+++ b/pkgs/games/forge-mtg/default.nix
@@ -1,6 +1,7 @@
 { coreutils
 , fetchFromGitHub
 , gnused
+, javaPackages
 , lib
 , maven
 , makeWrapper
@@ -21,46 +22,15 @@ let
   # launch4j downloads and runs a native binary during the package phase.
   patches = [ ./no-launch4j.patch ];
 
-  mavenRepository = stdenv.mkDerivation {
-    pname = "forge-mtg-maven-repository";
-    inherit version src patches;
-
-    nativeBuildInputs = [ maven ];
-
-    buildPhase = ''
-      runHook preBuild
-      # Tests need a running Xorg.
-      mvn package -Dmaven.repo.local=$out -DskipTests
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-      find $out -type f \( \
-        -name \*.lastUpdated \
-        -o -name resolver-status.properties \
-        -o -name _remote.repositories \) \
-        -delete
-      runHook postInstall
-    '';
-
-    outputHashAlgo = "sha256";
-    outputHashMode = "recursive";
-    outputHash = "sha256-aSNqAWbLebmiYnByyw5myc7eivzpP2STStz6qUUMw90=";
-  };
-
-in stdenv.mkDerivation {
+in javaPackages.mavenfod {
   pname = "forge-mtg";
   inherit version src patches;
 
-  nativeBuildInputs = [ maven makeWrapper ];
+  # Tests need a running Xorg.
+  mvnParameters = "-DskipTests";
+  mvnHash = "sha256-Bq02zyOZjah5jtFBEvE+Xif6aAAwPiuP5sUL42V8dUs=";
 
-  buildPhase = ''
-    runHook preBuild
-    # Tests need a running Xorg.
-    mvn --offline -Dmaven.repo.local=${mavenRepository} -DskipTests package;
-    runHook postBuild
-  '';
+  nativeBuildInputs = [ maven makeWrapper ];
 
   installPhase = ''
     runHook preInstall