diff --git a/artiq-fast/conda-windows/binutils.nix b/artiq-fast/conda-windows/binutils.nix
index 61e60b2..497bc86 100644
--- a/artiq-fast/conda-windows/binutils.nix
+++ b/artiq-fast/conda-windows/binutils.nix
@@ -19,7 +19,7 @@ let
   };
   build = wfvm.utils.wfvm-run {
     name = "build-binutils";
-    image = wfvm.makeWindowsImage { installCommands = with wfvm.layers; [ anaconda3 msys2 msys2-packages ]; };
+    image = wfvm.makeWindowsImage { installCommands = with wfvm.layers; [ anaconda3 msys2 (msys2-packages (import ./msys_packages.nix { inherit pkgs; } )) ]; };
     script = ''
       # Create a fake channel to work around another pile of bugs and cretinous design decisions from conda.
       ${wfvm.utils.win-exec}/bin/win-exec "mkdir fake-channel && mkdir fake-channel\win-64"
diff --git a/artiq-fast/wfvm/layers/msys_packages.nix b/artiq-fast/conda-windows/msys_packages.nix
similarity index 100%
rename from artiq-fast/wfvm/layers/msys_packages.nix
rename to artiq-fast/conda-windows/msys_packages.nix
diff --git a/artiq-fast/wfvm/demo-image.nix b/artiq-fast/wfvm/demo-image.nix
index 13c8efb..66040c0 100644
--- a/artiq-fast/wfvm/demo-image.nix
+++ b/artiq-fast/wfvm/demo-image.nix
@@ -37,7 +37,7 @@ wfvm.makeWindowsImage {
   # administratorPassword = "12345";
 
   # Imperative installation commands, to be installed incrementally
-  installCommands = with wfvm.layers; [ anaconda3 msys2 msys2-packages ];
+  installCommands = with wfvm.layers; [ anaconda3 msys2 msvc msvc-ide-unbreak ];
 
   # services = {
   #   # Enable remote management
diff --git a/artiq-fast/wfvm/layers/default.nix b/artiq-fast/wfvm/layers/default.nix
index c3f42bc..703c310 100644
--- a/artiq-fast/wfvm/layers/default.nix
+++ b/artiq-fast/wfvm/layers/default.nix
@@ -44,10 +44,9 @@ in
       echo MSYS2 installer finished
     '';
   };
-  msys2-packages = {
+  msys2-packages = msys-packages: {
     name = "MSYS2-packages";
     script = let
-      msys-packages = import ./msys_packages.nix { inherit pkgs; };
       msys-packages-put = pkgs.lib.strings.concatStringsSep "\n"
           (map (package: ''win-put ${package} 'msyspackages' '') msys-packages);
     in