From 97df33980cf46d4695aa186dcb2391f374e3e8ce Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 12 May 2023 06:32:56 -0400
Subject: feat: start using mkMultiMCPack

---
 flake.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index c956f57..cb8cbb3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,12 +7,10 @@
   };
 
   outputs = {
-    self,
     nixpkgs,
     packwiz2nix,
     ...
   }: let
-    version = self.lastModifiedDate;
     systems = [
       "x86_64-linux"
       "aarch64-linux"
@@ -22,17 +20,24 @@
 
     forAllSystems = nixpkgs.lib.genAttrs systems;
     nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;});
+    inherit (packwiz2nix.lib) mkChecksumsApp mkMultiMCPack mkPackwizPackages;
   in {
     apps = forAllSystems (s: let
       pkgs = nixpkgsFor.${s};
     in {
-      generate-checksums = packwiz2nix.lib.mkChecksumsApp pkgs ./mods;
+      generate-checksums = mkChecksumsApp pkgs ./mods;
     });
 
     packages = forAllSystems (s: let
       pkgs = nixpkgsFor.${s};
+      mods = mkPackwizPackages pkgs ./checksums.json;
     in rec {
-      getchoo-modpack = pkgs.callPackage ./nix {inherit version;};
+      getchoo-modpack = mkMultiMCPack {
+        inherit pkgs mods;
+        filesDir = ./files;
+        name = "getchoo-modpack";
+      };
+
       default = getchoo-modpack;
     });
 
-- 
cgit v1.2.3