From 2d3cf010fe48694a53897ad248ecb95dc458d9f9 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 26 Dec 2022 21:05:35 +0300 Subject: Revert "treewide: use nativeBuildInputs with runCommand instead of inlining" --- nixos/modules/virtualisation/brightbox-image.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'nixos/modules/virtualisation/brightbox-image.nix') 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 -- cgit 1.4.1