diff --git a/README.md b/README.md index 2a43290..af40fbb 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Create a modpack server or MultiMC client from a packwiz toml. ## Creating a server A server derivation can be created as follows: ```nix -nix-modpack.packages.${system}.mkServer { +nix-modpack.packages.${system}.mkModpackServer { packUrl = ""; server = nix-minecraft.legacyPackages.${system}.${server} } @@ -15,7 +15,7 @@ When this is added as a package to a flake, it can be started with `nix run`. ## Creating a client A client derivation can be created as follows: ```nix -nix-modpack.packages.${system}.mkClient { +nix-modpack.packages.${system}.mkModpackClient { packUrl = ""; gameVersion = ""; loaderUid = ""; diff --git a/flake.nix b/flake.nix index 42ef18b..efc21d5 100644 --- a/flake.nix +++ b/flake.nix @@ -11,9 +11,8 @@ lib = inputs.nixpkgs.lib; eachSystem = fn: lib.genAttrs lib.systems.flakeExposed (system: fn (import inputs.nixpkgs { inherit system; })); - in - { - packages = eachSystem ( + + mkPackages = pkgs: let bootstrap = pkgs.fetchurl { @@ -22,9 +21,14 @@ }; in { - mkServer = pkgs.callPackage ./packages/mkServer.nix { inherit bootstrap; }; - mkClient = pkgs.callPackage ./packages/mkClient.nix { inherit bootstrap; }; - } - ); + mkModpackServer = pkgs.callPackage ./packages/mkModpackServer.nix { inherit bootstrap; }; + mkModpackClient = pkgs.callPackage ./packages/mkModpackClient.nix { inherit bootstrap; }; + }; + in + rec { + packages = eachSystem mkPackages; + + overlay = overlays.default; + overlays.default = final: mkPackages; }; } diff --git a/packages/mkClient.nix b/packages/mkModpackClient.nix similarity index 100% rename from packages/mkClient.nix rename to packages/mkModpackClient.nix diff --git a/packages/mkServer.nix b/packages/mkModpackServer.nix similarity index 100% rename from packages/mkServer.nix rename to packages/mkModpackServer.nix