diff options
author | K900 <me@0upti.me> | 2022-12-26 21:05:35 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-26 21:05:35 +0300 |
commit | 2d3cf010fe48694a53897ad248ecb95dc458d9f9 (patch) | |
tree | 20f8ff6bdf03c5e1d45cf99a27e1fe75f3fcc8b9 /nixos/modules/virtualisation | |
parent | d72cf7be4825be52c905c816f8d49e1a25bfddc7 (diff) |
Revert "treewide: use nativeBuildInputs with runCommand instead of inlining"
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r-- | nixos/modules/virtualisation/brightbox-image.nix | 16 | ||||
-rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 19 |
2 files changed, 17 insertions, 18 deletions
diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix index 004b7ded0d5a9..9641b693f1847 100644 --- a/nixos/modules/virtualisation/brightbox-image.nix +++ b/nixos/modules/virtualisation/brightbox-image.nix @@ -27,21 +27,21 @@ in popd ''; diskImageBase = "nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw"; - nativeBuildInputs = with pkgs; [ e2fsprogs parted ]; - buildInputs = with pkgs; [ util-linux perl ]; - exportReferencesGraph = [ "closure" config.system.build.toplevel ]; + buildInputs = [ pkgs.util-linux pkgs.perl ]; + exportReferencesGraph = + [ "closure" config.system.build.toplevel ]; } '' # Create partition table - parted --script /dev/vda mklabel msdos - parted --script /dev/vda mkpart primary ext4 1 ${diskSize} - parted --script /dev/vda print + ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos + ${pkgs.parted}/sbin/parted --script /dev/vda mkpart primary ext4 1 ${diskSize} + ${pkgs.parted}/sbin/parted --script /dev/vda print . /sys/class/block/vda1/uevent mknod /dev/vda1 b $MAJOR $MINOR # Create an empty filesystem and mount it. - mkfs.ext4 -L nixos /dev/vda1 - tune2fs -c 0 -i 0 /dev/vda1 + ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1 + ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1 mkdir /mnt mount /dev/vda1 /mnt diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 51ac85b0a4f4a..1b3c0e23f97db 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -218,8 +218,7 @@ let chmod 0644 $efiVars '' else ""} ''; - nativeBuildInputs = with pkgs; [ dosfstools gptfdisk kmod mtools ]; - buildInputs = with pkgs; [ util-linux ]; + buildInputs = [ pkgs.util-linux ]; QEMU_OPTS = "-nographic -serial stdio -monitor none" + lib.optionalString cfg.useEFIBoot ( " -drive if=pflash,format=raw,unit=0,readonly=on,file=${cfg.efi.firmware}" @@ -227,7 +226,7 @@ let } '' # Create a /boot EFI partition with 60M and arbitrary but fixed GUIDs for reproducibility - sgdisk \ + ${pkgs.gptfdisk}/bin/sgdisk \ --set-alignment=1 --new=1:34:2047 --change-name=1:BIOSBootPartition --typecode=1:ef02 \ --set-alignment=512 --largest-new=2 --change-name=2:EFISystem --typecode=2:ef00 \ --attributes=1:set:1 \ @@ -250,16 +249,16 @@ let '' } - mkfs.fat -F16 /dev/vda2 + ${pkgs.dosfstools}/bin/mkfs.fat -F16 /dev/vda2 export MTOOLS_SKIP_CHECK=1 - mlabel -i /dev/vda2 ::boot + ${pkgs.mtools}/bin/mlabel -i /dev/vda2 ::boot # Mount /boot; load necessary modules first. - insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko.xz || true - insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko.xz || true - insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko.xz || true - insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko.xz || true - insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko.xz || true + ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko.xz || true + ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko.xz || true + ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko.xz || true + ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko.xz || true + ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko.xz || true mkdir /boot mount /dev/vda2 /boot |