2 files changed, 29 insertions, 40 deletions
diff --git a/flake.lock b/flake.lock
index 2248b4a4..e759b98d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -49,11 +49,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1641528457,
-        "narHash": "sha256-FyU9E63n1W7Ql4pMnhW2/rO9OftWZ37pLppn/c1aisY=",
+        "lastModified": 1641887635,
+        "narHash": "sha256-kDGpufwzVaiGe5e1sBUBPo9f1YN+nYHJlYqCaVpZTQQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ff377a78794d412a35245e05428c8f95fef3951f",
+        "rev": "b2737d4980a17cc2b7d600d7d0b32fd7333aca88",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 47a13ac2..a3296ac5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,41 +15,30 @@
     flake = false;
   };
 
-  outputs = inputs@{ self, nixpkgs, flake-utils, libnbtplusplus, quazip, ... }:
-    flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system:
-      let
-        pkgs = import nixpkgs {
-          inherit system;
-        };
-
-        packages = {
-          polymc = pkgs.libsForQt5.callPackage ./packages/nix/polymc {
-            inherit self;
-            submoduleQuazip = quazip;
-            submoduleNbt = libnbtplusplus;
-          };
-        };
-        
-        # 'nix flake check' fails
-        overlay = (final: prev: rec { 
-          polymc = prev.libsForQt5.callPackage ./packages/nix/polymc {
-            inherit self;
-            submoduleQuazip = quazip;
-            submoduleNbt = libnbtplusplus;
-          };
-        });
-
-        apps = {
-          polymc = flake-utils.lib.mkApp {
-            name = "polymc";
-            drv = packages.polymc;
-          };
-        };
-      in
-      {
-        inherit packages overlay apps;
-        defaultPackage = packages.polymc;
-        defaultApp = apps.polymc;
-      }
-    );
+  outputs = args@{ self, nixpkgs, flake-utils, libnbtplusplus, quazip, ... }:
+  {
+    overlay = final: prev: {
+      inherit (self.packages.${final.system})
+      polymc;
+    };
+  } // flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux"] (system:
+    let pkgs = import nixpkgs {
+      inherit system;
+    };
+    in {
+      defaultPackage = self.packages.${system}.polymc;
+      packages = rec {
+        polymc = pkgs.libsForQt5.callPackage ./packages/nix/polymc {
+	  inherit self;
+	  submoduleQuazip = quazip;
+	  submoduleNbt = libnbtplusplus;
+	};
+      };
+      apps = rec {
+	polymc = flake-utils.lib.mkApp {
+	  name = "polymc";
+	  drv = self.packages.${system}.polymc;
+	};
+      };
+    });
 }