update to latest working nixpkgs and fix bug where sdcard boot would …

…not work
rcambrj · Jan 21, 2025 · 7ea86da · 7ea86da
1 parent 34989d9
commit 7ea86da
Show file tree

Hide file tree

Showing 4 changed files with 693 additions and 8 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,7 +3,8 @@
 
   # Add all your dependencies here
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
+    # pin nixpkgs https://github.com/NixOS/nixpkgs/pull/362081#issuecomment-2596822330
+    nixpkgs.url = "github:NixOS/nixpkgs?ref=7cf092925906d588daabc696d663c100f2bbacc6";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     blueprint.url = "github:numtide/blueprint";
     blueprint.inputs.nixpkgs.follows = "nixpkgs";

diff --git a/modules/nixos/host-common.nix b/modules/nixos/host-common.nix
@@ -13,10 +13,10 @@
     enable = true;
   };
 
-  system.build.image = (import "${toString modulesPath}/../lib/make-disk-image.nix" {
+  system.build.image = (import ./make-disk-image.nix {
     inherit lib config pkgs;
     format = "raw";
-    partitionTableType = "efi";
+    partitionTableType = "legacy+boot";
     copyChannel = false;
     diskSize = "auto";
     additionalSpace = "64M";
@@ -34,7 +34,7 @@
 
   fileSystems = {
     "/boot" = {
-      device = "/dev/disk/by-label/ESP";
+      device = "/dev/disk/by-label/BOOT";
       fsType = "vfat";
     };
     "/" = {