From 1d7b1e9175a98c55eac1d680572edf0baf3f469b Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Wed, 22 Jul 2020 08:24:37 +0800
Subject: [PATCH] conda-windows-binutils-arm: likewise

---
 artiq-fast/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/artiq-fast/default.nix b/artiq-fast/default.nix
index d0705ae..0594834 100644
--- a/artiq-fast/default.nix
+++ b/artiq-fast/default.nix
@@ -123,22 +123,24 @@ let
     };
   };
 
-  condaWindowsExperimental = rec {
-    windows-binutils-or1k = import ./windows/binutils.nix {
-      inherit pkgs;
-      inherit (mainPackages.binutils-or1k) version src;
-      target = "or1k-linux";
+  windowsBinutils = targetName: target:
+    import ./windows/binutils.nix {
+      inherit pkgs target;
+      inherit (mainPackages."binutils-${targetName}") version src;
     };
-    conda-windows-binutils-or1k = import ./conda-windows/binutils.nix {
+
+  condaWindowsExperimental = rec {
+    conda-windows-binutils-or1k = import ./conda-windows/binutils.nix rec {
       inherit pkgs;
       inherit (mainPackages.binutils-or1k) version;
       target = "or1k-linux";
-      windows-binutils = windows-binutils-or1k;
+      windows-binutils = windowsBinutils "or1k" target;
     };
-    conda-windows-binutils-arm = import ./conda-windows/binutils.nix {
+    conda-windows-binutils-arm = import ./conda-windows/binutils.nix rec {
       inherit pkgs;
       inherit (mainPackages.binutils-or1k) version src;
       target = "armv7-unknown-linux-gnueabihf";
+      windows-binutils = windowsBinutils "arm" target;
     };
     conda-windows-llvm-or1k = import ./conda-windows/llvm-or1k.nix {
       inherit pkgs;