Merge branch 'develop' into feature/sparkle-mac

# Conflicts:
#	.github/workflows/build.yml

1 files changed, 14 insertions, 11 deletions

diff --git a/flake.nix b/flake.nix
index e59d6be8..c2fdffda 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,30 +5,33 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
     libnbtplusplus = { url = "github:multimc/libnbtplusplus"; flake = false; };
-    quazip = { url = "github:stachenov/quazip"; flake = false; };
   };
 
-  outputs = { self, nixpkgs, libnbtplusplus, quazip, ... }:
+  outputs = { self, nixpkgs, libnbtplusplus, ... }:
     let
-      # Generate a user-friendly version number.
+      # User-friendly version number.
       version = builtins.substring 0 8 self.lastModifiedDate;
 
-      # System types to support (qtbase is currently broken for "aarch64-darwin")
+      # Supported systems (qtbase is currently broken for "aarch64-darwin")
       supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
 
       # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
       forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
 
-      # Nixpkgs instantiated for supported system types.
+      # Nixpkgs instantiated for supported systems.
       pkgs = forAllSystems (system: nixpkgs.legacyPackages.${system});
+
+      packagesFn = pkgs: rec {
+        polymc = pkgs.libsForQt5.callPackage ./nix { inherit version self libnbtplusplus; };
+        polymc-qt6 = pkgs.qt6Packages.callPackage ./nix { inherit version self libnbtplusplus; };
+      };
     in
     {
-      packages = forAllSystems (system: { polymc = pkgs.${system}.libsForQt5.callPackage ./packages/nix/polymc { inherit version self quazip libnbtplusplus; }; });
-      defaultPackage = forAllSystems (system: self.packages.${system}.polymc);
-
-      apps = forAllSystems (system: { polymc = { type = "app"; program = "${self.defaultPackage.${system}}/bin/polymc"; }; });
-      defaultApp = forAllSystems (system: self.apps.${system}.polymc);
+      packages = forAllSystems (system:
+        let packages = packagesFn pkgs.${system}; in
+        packages // { default = packages.polymc; }
+      );
 
-      overlay = final: prev: { polymc = self.defaultPackage.${final.system}; };
+      overlay = final: packagesFn;
     };
 }