From bdce8389fb18a66b02e5761fa2c7a3ffad87fd85 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Fri, 24 May 2024 16:10:19 -0700 Subject: [PATCH] Rename buildGradle to buildGradlePackage --- default.nix | 6 +++--- flake.nix | 2 ++ gradle.nix | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index 4a79742..e0009a4 100644 --- a/default.nix +++ b/default.nix @@ -3,9 +3,9 @@ with pkgs; let - buildGradle = callPackage ./gradle.nix {}; + buildGradlePackage = callPackage ./gradle.nix {}; - gradle2nix = buildGradle { + gradle2nix = buildGradlePackage { pname = "gradle2nix"; version = "2.0.0"; lockFile = ./gradle.lock; @@ -33,7 +33,7 @@ let ''; passthru = { - build = buildGradle; + inherit buildGradlePackage; plugin = "${gradle2nix}/share/plugin.jar"; }; diff --git a/flake.nix b/flake.nix index 1ccebb5..d8bfb58 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,8 @@ pkgs = nixpkgs.legacyPackages.${system}; in { + builders.default = pkgs.callPackage ./gradle.nix {}; + packages.default = pkgs.callPackage ./default.nix {}; apps.default = { diff --git a/gradle.nix b/gradle.nix index 509a3e5..71be006 100644 --- a/gradle.nix +++ b/gradle.nix @@ -280,7 +280,7 @@ let ''; - buildGradle = stdenv.mkDerivation (finalAttrs: { + buildGradlePackage = stdenv.mkDerivation (finalAttrs: { inherit buildJdk enableParallelBuilding enableDebug gradle gradleFlags pname version; @@ -328,4 +328,4 @@ let ]); in -buildGradle +buildGradlePackage