From 7f32f8e438a7ab0b6851054f7d2ca633f17b9714 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Fri, 24 Jul 2020 09:35:06 +0800
Subject: [PATCH] Revert "conda-windows-binutils-arm: likewise"

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

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