colin
/
nix-files
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flake: fix passthru overlays (fixes broken image building)

This commit is contained in:
colin 2023-01-11 09:08:46 +00:00
parent bd5209c655
commit d4996d6f31
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flake.nix
View File

@ -103,13 +103,16 @@
overlays = rec {
default = pkgs;
pkgs = import ./pkgs/overlay.nix;
passthru = next: prev:
passthru =
let
stable = nixpkgs-stable.legacyPackages."${prev.stdenv.hostPlatform}";
stable = next: prev: {
stable = nixpkgs-stable.legacyPackages."${prev.stdenv.hostPlatform}";
};
mobile = (import "${mobile-nixos}/overlay/overlay.nix");
uninsane = uninsane-dot-org.overlay;
in
uninsane next (mobile next (stable next prev));
next: prev:
(stable next prev) // (mobile next prev) // (uninsane next prev);
};
nixosModules = rec {

2
modules/image.nix
View File

@ -82,7 +82,7 @@ in
in
lib.mkIf cfg.enable
{
system.build.img-without-firmware = with pkgs; imageBuilder.diskImage.makeGPT {
system.build.img-without-firmware = with pkgs; pkgs.imageBuilder.diskImage.makeGPT {
name = "nixos";
diskID = vfatUuidFromFs bootFs;
# leave some space for firmware