From e81bd1ae37d3cf9c3bb420763d827bb614c882c6 Mon Sep 17 00:00:00 2001 From: Alexander Sosedkin Date: Thu, 16 Dec 2021 22:14:32 +0100 Subject: [PATCH] flake.nix: simplify to single arch --- flake.nix | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 2a1f91c..36f55d0 100644 --- a/flake.nix +++ b/flake.nix @@ -13,13 +13,13 @@ let overlay = nixpkgs.lib.composeManyExtensions (import ./overlays); - pkgsPerSystem = system: import nixpkgs { - inherit system; + pkgs' = import nixpkgs { + system = "aarch64-linux"; overlays = [ overlay ]; }; - appPerSystem = system: flake-utils.lib.mkApp { - drv = (pkgsPerSystem system).callPackage ./nix-on-droid { }; + app = flake-utils.lib.mkApp { + drv = pkgs'.callPackage ./nix-on-droid { }; }; in { @@ -27,21 +27,17 @@ lib.nixOnDroidConfiguration = { config - , system + , system ? "aarch64-linux" # unused , extraModules ? [ ] , extraSpecialArgs ? { } - , pkgs ? pkgsPerSystem system + , pkgs ? pkgs' , home-manager-path ? home-manager.outPath }: import ./modules { inherit config extraModules extraSpecialArgs home-manager-path pkgs; isFlake = true; }; - } - // flake-utils.lib.eachSystem - [ "aarch64-linux" ] - (system: { - apps.nix-on-droid = appPerSystem system; - defaultApp = appPerSystem system; - }); + apps.nix-on-droid.aarch64-linux = app; + defaultApp.aarch64-linux = app; + }; }