From 00bc3c531dc3a074717e80dc0914c5e7d390c2d2 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 20 Jun 2023 19:54:46 +0300
Subject: [PATCH] maven.buildMavenPackage: rename from javaPackages.mavenfod

---
 .../build-managers/apache-maven/build-package.nix}           | 0
 .../tools/build-managers/apache-maven/default.nix            | 5 +++++
 pkgs/top-level/java-packages.nix                             | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)
 rename pkgs/development/{java-modules/maven-fod.nix => tools/build-managers/apache-maven/build-package.nix} (100%)

diff --git a/pkgs/development/java-modules/maven-fod.nix b/pkgs/development/tools/build-managers/apache-maven/build-package.nix
similarity index 100%
rename from pkgs/development/java-modules/maven-fod.nix
rename to pkgs/development/tools/build-managers/apache-maven/build-package.nix
diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix
index a32d12a35514..4206bc48927d 100644
--- a/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -3,6 +3,7 @@
 , fetchurl
 , jdk
 , makeWrapper
+, callPackage
 }:
 
 assert jdk != null;
@@ -34,6 +35,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.buildMavenPackage = callPackage ./build-package.nix {
+    maven = finalAttrs.finalPackage;
+  };
+
   meta = with lib; {
     mainProgram = "mvn";
     description = "Build automation tool (used primarily for Java projects)";
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index f4e39fb81086..98567c7b9fca 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -8,7 +8,7 @@ let
   openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { };
   openjfx19 = callPackage ../development/compilers/openjdk/openjfx/19.nix { };
 
-  mavenfod = callPackage ../development/java-modules/maven-fod.nix { };
+  mavenfod = pkgs.maven.buildMavenPackage;
 
 in {
   inherit mavenfod openjfx11 openjfx15 openjfx17 openjfx19;