improve flake.nix

export m1n1 and uboot-asahi for cross-compilation remove asahi-fwextract from package outputs
tpwrules · Jan 17, 2023 · 2918ce9 · 2918ce9
1 parent 45b62ba
commit 2918ce9
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/flake.nix b/flake.nix
@@ -11,24 +11,21 @@
     flake-parts.lib.mkFlake { inherit inputs; } (
       { withSystem, ... }: {
         flake = {
-          overlays.default = import packages/overlay.nix;
+          overlays = rec {
+            asahi-overlay = import packages/overlay.nix;
+            default = asahi-overlay;
+          };
 
           nixosModules = rec {
             m1-support = ./nixos-module;
             default = m1-support;
           };
-
-          packages.aarch64-linux = withSystem "aarch64-linux" (
-            { pkgs, ... }: {
-              inherit (pkgs) m1n1 uboot-asahi asahi-fwextract;
-            }
-          );
         };
 
-        # all nixpkgs systems
-        systems = inputs.nixpkgs.lib.systems.flakeExposed;
+        # build platforms supported for uboot in nixpkgs
+        systems = [ "aarch64-linux" "x86_64-linux" "i686-linux" ];
 
-        perSystem = { system, ... }: {
+        perSystem = { system, pkgs, ... }: {
           # override the `pkgs` argument used by flake-parts modules
           _module.args.pkgs = import inputs.nixpkgs {
             inherit system;
@@ -39,6 +36,8 @@
           };
 
           packages = {
+            inherit (pkgs) m1n1 uboot-asahi;
+
             installer-bootstrap =
               let
                 installer-system = inputs.nixpkgs.lib.nixosSystem {