From f464b61290424e88e4d5fcb3fbd41ba94af550fa Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 16 Jun 2020 12:52:42 +0800
Subject: [PATCH] conda-windows: fix binutils target handling

---
 artiq-fast/conda-windows/binutils.nix | 4 ++--
 artiq-fast/wfvm/demo-image.nix        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/artiq-fast/conda-windows/binutils.nix b/artiq-fast/conda-windows/binutils.nix
index 149dad3..0112c2c 100644
--- a/artiq-fast/conda-windows/binutils.nix
+++ b/artiq-fast/conda-windows/binutils.nix
@@ -41,7 +41,7 @@ let
       set LDFLAGS=-L%PREFIX:\=/%/Library/lib/
       sh ../configure --build=%TRIPLE% ^
         --prefix="%PREFIX:\=/%/Library" ^
-        --target=or1k-linux
+        --target=${target}
       if errorlevel 1 exit 1
 
       make -j4
@@ -51,7 +51,7 @@ let
       if errorlevel 1 exit 1
 
       rem this is a copy of prefixed executables
-      rmdir /S /Q %PREFIX%\Library\or1k-linux
+      rmdir /S /Q %PREFIX%\Library\${target}
       EOF
 
       ${wfvm.utils.win-exec}/bin/win-exec "mkdir binutils"
diff --git a/artiq-fast/wfvm/demo-image.nix b/artiq-fast/wfvm/demo-image.nix
index 13c8efb..155b2e4 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 ];
 
   # services = {
   #   # Enable remote management