From ad24ba30d3dbd463d6b1295830b86a5e67a00a68 Mon Sep 17 00:00:00 2001
From: Thomas Strobel
 <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>
Date: Fri, 3 Mar 2017 19:14:20 +0100
Subject: [PATCH] fix: "nixos-rebuild build-vm-with-bootloader"

(cherry picked from commit 0a8d9779c5b3bce15b252bb0f31c94744107ecf6)
---
 nixos/modules/virtualisation/qemu-vm.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 56a05028b1d1..dcf14c73610f 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -138,13 +138,13 @@ let
         ''
           # Create a /boot EFI partition with 40M
           ${pkgs.gptfdisk}/bin/sgdisk -G /dev/vda
-          ${pkgs.gptfdisk}/bin/sgdisk -a 1 -n 1:34:2047 -c 1:"BIOS Boot Partition" -t 1:ef02 /dev/vda
-          ${pkgs.gptfdisk}/bin/sgdisk -a 512 -N 2 -c 2:"EFI System" -t 2:ef00 /dev/vda
+          ${pkgs.gptfdisk}/bin/sgdisk -a 1 -n 1:34:2047 -c 1:BIOSBootPartition -t 1:ef02 /dev/vda
+          ${pkgs.gptfdisk}/bin/sgdisk -a 512 -N 2 -c 2:EFISystem -t 2:ef00 /dev/vda
           ${pkgs.gptfdisk}/bin/sgdisk -A 1:set:1 /dev/vda
           ${pkgs.gptfdisk}/bin/sgdisk -A 2:set:2 /dev/vda
           ${pkgs.gptfdisk}/bin/sgdisk -h 2 /dev/vda
           ${pkgs.gptfdisk}/bin/sgdisk -C /dev/vda
-          ${pkgs.utillinux}/bin/sfdisk /dev/vda -A 2
+          ${pkgs.gptfdisk}/bin/sgdisk -A 2:set:2 /dev/vda
           . /sys/class/block/vda2/uevent
           mknod /dev/vda2 b $MAJOR $MINOR
           . /sys/class/block/vda/uevent