From ea0bc3224593ddf7ac6c702c7acb6c89cf188f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 12 Jul 2024 16:19:03 +0200
Subject: [PATCH] maven: use headless jdk to avoid GUI dependencies

This fixes build with environment.noXlibs enabled.
---
 pkgs/by-name/ma/maven/build-maven-package.nix | 2 ++
 pkgs/by-name/ma/maven/package.nix             | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix
index b398d7ffe83a..3808d40c6f9f 100644
--- a/pkgs/by-name/ma/maven/build-maven-package.nix
+++ b/pkgs/by-name/ma/maven/build-maven-package.nix
@@ -87,6 +87,8 @@ stdenv.mkDerivation (builtins.removeAttrs args [ "mvnFetchExtraArgs" ] // {
     maven
   ];
 
+  JAVA_HOME = mvnJdk;
+
   buildPhase = ''
     runHook preBuild
 
diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix
index 8919cb1f748b..19844103ed85 100644
--- a/pkgs/by-name/ma/maven/package.nix
+++ b/pkgs/by-name/ma/maven/package.nix
@@ -2,7 +2,7 @@
   lib,
   callPackage,
   fetchurl,
-  jdk,
+  jdk_headless,
   makeWrapper,
   stdenvNoCC,
 }:
@@ -27,9 +27,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     cp -r apache-maven-${finalAttrs.version}/* $out/maven
 
     makeWrapper $out/maven/bin/mvn $out/bin/mvn \
-      --set-default JAVA_HOME "${jdk}"
+      --set-default JAVA_HOME "${jdk_headless}"
     makeWrapper $out/maven/bin/mvnDebug $out/bin/mvnDebug \
-      --set-default JAVA_HOME "${jdk}"
+      --set-default JAVA_HOME "${jdk_headless}"
 
     runHook postInstall
   '';
@@ -55,6 +55,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.asl20;
     mainProgram = "mvn";
     maintainers = with lib.maintainers; [ ];
-    inherit (jdk.meta) platforms;
+    inherit (jdk_headless.meta) platforms;
   };
 })