buildMavenPackage: use better function names for

the `overrideMavenAttrs` function.
NixOS · May 25, 2024 · 4e613d3 · 4e613d3
1 parent eb9357d
commit 4e613d3
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -37,20 +37,21 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   passthru =
     let
-      makeOverridableMavenPackage = f: origArgs:
+      makeOverridableMavenPackage = mavenRecipe: mavenArgs:
         let
-          ff = f origArgs;
-          overrideWith = newArgs: origArgs // (if lib.isFunction newArgs then newArgs origArgs else newArgs);
+          drv = mavenRecipe mavenArgs;
+          overrideWith = newArgs: mavenArgs //
+            (if lib.isFunction newArgs then newArgs mavenArgs else newArgs);
         in
-        if builtins.isAttrs ff then
-          (ff // {
-            overrideMavenAttrs = newArgs: makeOverridableMavenPackage f (overrideWith newArgs);
+        if builtins.isAttrs drv then
+          (drv // {
+            overrideMavenAttrs = newArgs: makeOverridableMavenPackage mavenRecipe (overrideWith newArgs);
           })
-        else if builtins.isFunction ff then {
-          overrideMavenAttrs = newArgs: makeOverridableMavenPackage f (overrideWith newArgs);
-          __functor = self: ff;
+        else if builtins.isFunction drv then {
+          overrideMavenAttrs = newArgs: makeOverridableMavenPackage mavenRecipe (overrideWith newArgs);
+          __functor = self: drv;
         }
-        else ff;
+        else drv;
     in
     {
       buildMavenPackage = makeOverridableMavenPackage (callPackage ./build-package.nix {