From 609fcb404d746772ee4cd445a153341002ec8b5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 15 Jul 2024 15:12:40 +0200
Subject: [PATCH] global-platform-pro: stop overwriting maven

---
 pkgs/development/tools/global-platform-pro/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix
index 94186dc643c6..b35cc4998f67 100644
--- a/pkgs/development/tools/global-platform-pro/default.nix
+++ b/pkgs/development/tools/global-platform-pro/default.nix
@@ -1,10 +1,6 @@
 { lib, stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite, proot, zlib }:
 
 let
-  mavenJdk8 = maven.override {
-    jdk = jdk8;
-  };
-
   defineMvnWrapper = ''
     mvn()
     {
@@ -16,7 +12,7 @@ let
     }
   '';
 in
-mavenJdk8.buildMavenPackage rec {
+maven.buildMavenPackage rec {
   pname = "global-platform-pro";
   version = "20.01.23";
   GPPRO_VERSION = "v20.01.23-0-g5ad373b"; # git describe --tags --always --long --dirty
@@ -28,6 +24,7 @@ mavenJdk8.buildMavenPackage rec {
     sha256 = "sha256-z38I61JR4oiAkImkbwcvXoK5QsdoR986dDrOzhHsCeY=";
   };
 
+  mvnJdk = jdk8;
   mvnHash = "sha256-es8M7gV2z1V9VpWOxanJwQyiemabiUw3n4heJB8Q75A=";
 
   nativeBuildInputs = [ jdk8 makeWrapper ];