From e347cb7c4bc522a1d6b5e2dc3a4190d5d4f7f401 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 23 Jun 2020 22:27:18 +0800
Subject: [PATCH] conda-windows: use compiled llvm-or1k for llvmlite-artiq

---
 artiq-fast/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/artiq-fast/default.nix b/artiq-fast/default.nix
index 7051539..aa99e2f 100644
--- a/artiq-fast/default.nix
+++ b/artiq-fast/default.nix
@@ -123,7 +123,7 @@ let
     };
   };
 
-  condaWindowsExperimental = {
+  condaWindowsExperimental = rec {
     conda-windows-binutils-or1k = import ./conda-windows/binutils.nix {
       inherit pkgs;
       inherit (mainPackages.binutils-or1k) version src;
@@ -140,9 +140,7 @@ let
       src = mainPackages.llvm-or1k.llvm-src;
     };
     conda-windows-llvmlite-artiq = import ./conda-windows/llvmlite-artiq.nix {
-      inherit pkgs;
-      # TODO: stop using the legacy package after https://github.com/m-labs/artiq/issues/1473 is fixed
-      inherit (condaWindowsLegacy) conda-windows-llvm-or1k;
+      inherit pkgs conda-windows-llvm-or1k;
       inherit (mainPackages.llvmlite-artiq) version src;
     };
   };