Rename buildGradle to buildGradlePackage

This commit is contained in:
Tad Fisher
2024-05-24 16:10:19 -07:00
parent f82c91be9f
commit bdce8389fb
3 changed files with 7 additions and 5 deletions

View File

@@ -3,9 +3,9 @@
with pkgs; with pkgs;
let let
buildGradle = callPackage ./gradle.nix {}; buildGradlePackage = callPackage ./gradle.nix {};
gradle2nix = buildGradle { gradle2nix = buildGradlePackage {
pname = "gradle2nix"; pname = "gradle2nix";
version = "2.0.0"; version = "2.0.0";
lockFile = ./gradle.lock; lockFile = ./gradle.lock;
@@ -33,7 +33,7 @@ let
''; '';
passthru = { passthru = {
build = buildGradle; inherit buildGradlePackage;
plugin = "${gradle2nix}/share/plugin.jar"; plugin = "${gradle2nix}/share/plugin.jar";
}; };

View File

@@ -12,6 +12,8 @@
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
in { in {
builders.default = pkgs.callPackage ./gradle.nix {};
packages.default = pkgs.callPackage ./default.nix {}; packages.default = pkgs.callPackage ./default.nix {};
apps.default = { apps.default = {

View File

@@ -280,7 +280,7 @@ let
''; '';
buildGradle = stdenv.mkDerivation (finalAttrs: { buildGradlePackage = stdenv.mkDerivation (finalAttrs: {
inherit buildJdk enableParallelBuilding enableDebug gradle gradleFlags pname version; inherit buildJdk enableParallelBuilding enableDebug gradle gradleFlags pname version;
@@ -328,4 +328,4 @@ let
]); ]);
in in
buildGradle buildGradlePackage