yep, more dotfiles

fix(apps): simplify isos creation to fix ci

+3 -11
apps/default.nix
···
-
{ forAllPkgs }:
+
{ pkgs-per-system }:
{ lib
, ...
···
let
apps = {
-
# app = exec
+
flash-installer-iso-x86_64-linux = import ./flash-installer.nix pkgs-per-system.x86_64-linux pkgs;
};
-
-
# Installer ISOs do need to consider target architecture
-
# We matrix over all systems to make `flash-installer-iso-${targetSystem}`
-
flash-installer-iso-matrix = lib.mapAttrs'
-
(name: value: { name = "flash-installer-iso-${name}"; inherit value; })
-
(forAllPkgs (targetPkg: (import ./flash-installer.nix targetPkg) pkgs));
-
-
all-apps = apps // flash-installer-iso-matrix;
in
-
lib.mapAttrs (_: program: { type = "app"; inherit program; }) all-apps
+
lib.mapAttrs (_: program: { type = "app"; inherit program; }) apps
+1 -1
apps/flash-installer.nix
···
let
inherit (self.outputs) flake-lib;
-
iso = flake-lib.createSystem targetSystemPkgs [ ../nixos/profiles/installer.nix ];
+
iso = flake-lib.nixos.createSystem targetSystemPkgs [ ../nixos/profiles/installer.nix ];
# Build installer ISO
isoPath = "${iso.config.system.build.isoImage}/iso/${iso.config.isoImage.isoName}";
+1 -1
flake.nix
···
lib = forAllPkgs (import ./lib);
templates = import ./templates;
-
apps = forAllPkgs (import ./apps { inherit forAllPkgs; });
+
apps = forAllPkgs (import ./apps { pkgs-per-system = pkgs; });
devShells = forAllPkgs (import ./shells.nix);
overlays = import ./overlays (nixpkgs // { inherit self; });
packages = forAllPkgs (import ./pkgs);