From 5f732d097854a051689e09d367ee03ca0052d9b8 Mon Sep 17 00:00:00 2001
From: Benedikt Ritter <beneritter@gmail.com>
Date: Fri, 15 May 2026 09:55:55 +0200
Subject: [PATCH] mvnd: use finalAttrs

Based on the changes in #513696 and #516099.
---
 pkgs/by-name/mv/mvnd/package.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix
index 1a2e901ea6e2..1820c6f2ad1b 100644
--- a/pkgs/by-name/mv/mvnd/package.nix
+++ b/pkgs/by-name/mv/mvnd/package.nix
@@ -5,7 +5,6 @@
   installShellFiles,
   makeWrapper,
   maven,
-  mvnd,
   nix-update-script,
   runCommand,
   stdenv,
@@ -19,16 +18,15 @@ let
     x86_64-darwin = "darwin-amd64";
     x86_64-linux = "linux-amd64";
   };
-  inherit (platformMap.${stdenv.system}) os arch;
 in
 
-maven.buildMavenPackage rec {
+maven.buildMavenPackage (finalAttrs: {
   pname = "mvnd";
   version = "1.0.5";
   src = fetchFromGitHub {
     owner = "apache";
     repo = "maven-mvnd";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "sha256-/ODRS6xaxkn7okUh8phN1GUNG7tDAKjmAIQn8NrC+ag=";
   };
 
@@ -42,7 +40,7 @@ maven.buildMavenPackage rec {
     makeWrapper
   ];
 
-  mvnDepsParameters = mvnParameters;
+  mvnDepsParameters = finalAttrs.mvnParameters;
   mvnParameters = lib.concatStringsSep " " (
     [
       "-Dmaven.buildNumber.skip=true" # skip build number generation; requires a git repository
@@ -69,7 +67,7 @@ maven.buildMavenPackage rec {
     mkdir -p $out/bin
     mkdir -p $out/mvnd-home
 
-    cp -r dist/target/maven-mvnd-${version}-${platformMap.${stdenv.system}}/* $out/mvnd-home
+    cp -r dist/target/maven-mvnd-${finalAttrs.version}-${platformMap.${stdenv.system}}/* $out/mvnd-home
     makeWrapper $out/mvnd-home/bin/mvnd $out/bin/mvnd \
       --set-default MVND_HOME $out/mvnd-home
 
@@ -89,13 +87,13 @@ maven.buildMavenPackage rec {
       package =
         runCommand "mvnd"
           {
-            inherit version;
+            inherit (finalAttrs) version;
             nativeBuildInputs = [ makeWrapper ];
           }
           ''
             mkdir -p $out/bin
-            makeWrapper ${mvnd}/bin/mvnd $out/bin/mvnd \
-              --suffix PATH : ${lib.makeBinPath [ mvnJdk ]}
+            makeWrapper ${finalAttrs.finalPackage}/bin/mvnd $out/bin/mvnd \
+              --suffix PATH : ${lib.makeBinPath [ finalAttrs.mvnJdk ]}
           '';
     };
   });
@@ -108,4 +106,4 @@ maven.buildMavenPackage rec {
     maintainers = with lib.maintainers; [ nathanregner ];
     mainProgram = "mvnd";
   };
-}
+})