From 4e613d31232d276e150d5b0baa583d415a230864 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Sat, 25 May 2024 15:21:04 +0200 Subject: [PATCH] buildMavenPackage: use better function names for the `overrideMavenAttrs` function. --- .../build-managers/apache-maven/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 4ceec4851e69a..dfe3b50851f90 100644 --- 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 {