diff --git a/flake.nix b/flake.nix index 776919f..496393c 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,7 @@ default = self.packages.${system}.image; image = pkgs.callPackage ./pkgs/image { inherit version updateUrl cpuArch secureBoot; }; - image-aarch64 = pkgsCross.callPackage ./pkgs/image { inherit version updateUrl cpuArch 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 d9205f3..6af3c14 100644 --- a/pkgs/image/default.nix +++ b/pkgs/image/default.nix @@ -16,7 +16,7 @@ runCommand pname { microcode = lib.optionalString (cpuArch == "amd") "--microcode ${pkgs.microcode-amd}/amd-ucode.img" + lib.optionalString (cpuArch == "intel") "--microcode ${pkgs.microcode-intel}/intel-ucode.img"; - buildInputs = with pkgs; [ + nativeBuildInputs = with pkgs; [ erofs-utils dosfstools mtools @@ -251,7 +251,7 @@ ${pkgs.patos.systemd}/usr/bin/systemd-repart \ --definitions=./final.repart.d \ patos_${version}.img > final-repart-output.json -rm -rf init.repart.d final.repart.d *.json +rm -rf rootfs init.repart.d final.repart.d *.json sha256sum *.root *.verity *.efi *.tar.xz > SHA256SUMS popd diff --git a/pkgs/rootfs/mkinitrd.nix b/pkgs/rootfs/mkinitrd.nix index cdbfe11..0691e7b 100644 --- a/pkgs/rootfs/mkinitrd.nix +++ b/pkgs/rootfs/mkinitrd.nix @@ -9,7 +9,7 @@ in runCommand "patos-initrd" { inherit secureBootEnroll; - buildInputs = with pkgs; [ + nativeBuildInputs = with pkgs; [ cpio xz ];