diff --git a/flake.nix b/flake.nix index 496393c..66b86c8 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ let version = "0.0.1"; secureBoot = "false"; - cpuArch = "intel"; + microcode = "intel"; updateUrl = "http://10.0.2.2:8000/"; overlay = final: prev: { @@ -51,7 +51,7 @@ packages = { default = self.packages.${system}.image; - image = pkgs.callPackage ./pkgs/image { inherit version updateUrl cpuArch secureBoot; }; + image = pkgs.callPackage ./pkgs/image { inherit version updateUrl microcode secureBoot; }; image-aarch64 = pkgsCross.callPackage ./pkgs/image { inherit version updateUrl secureBoot; }; qemu-uefi-tpm = pkgs.callPackage ./utils/qemu-uefi-tpm.nix { }; diff --git a/pkgs/image/default.nix b/pkgs/image/default.nix index 6af3c14..863c795 100644 --- a/pkgs/image/default.nix +++ b/pkgs/image/default.nix @@ -4,17 +4,17 @@ version, runCommand, updateUrl, - cpuArch ? "", + microcode ? "", secureBoot ? "false" }: let pname = "patos-image"; in runCommand pname { - inherit version cpuArch updateUrl secureBoot; + inherit version microcode updateUrl secureBoot; - microcode = lib.optionalString (cpuArch == "amd") "--microcode ${pkgs.microcode-amd}/amd-ucode.img" - + lib.optionalString (cpuArch == "intel") "--microcode ${pkgs.microcode-intel}/intel-ucode.img"; + mcode = lib.optionalString (microcode == "amd") "--microcode ${pkgs.microcode-amd}/amd-ucode.img" + + lib.optionalString (microcode == "intel") "--microcode ${pkgs.microcode-intel}/intel-ucode.img"; nativeBuildInputs = with pkgs; [ erofs-utils @@ -184,7 +184,7 @@ ln -sf patos_$version.root.raw patos_${version}_$rootUuid.root ${pkgs.patos.systemd}/usr/bin/ukify build \ --linux ${pkgs.patos.kernel}/bzImage \ --initrd ${pkgs.patos.initrd}/initrd.xz \ - $microcode \ + $mcode \ --os-release @rootfs/etc/os-release \ --cmdline "$kernelCmdLine roothash=$roothash" \ -o patos_${version}.efi