From 11dfff09b9107776312d3d5e87628ffc70c77caa Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Mon, 22 Jun 2020 15:22:25 +0800
Subject: [PATCH] artiq-fast: fix a448d3bdc

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

diff --git a/artiq-fast/default.nix b/artiq-fast/default.nix
index d0a98a4..630c5f9 100644
--- a/artiq-fast/default.nix
+++ b/artiq-fast/default.nix
@@ -64,7 +64,7 @@ let
     };
     conda-bscan-spi-bitstreams = import ./conda/bscan-spi-bitstreams.nix {
       inherit pkgs;
-      inherit (openocd) bscan_spi_bitstreams;
+      inherit (mainPackages.openocd) bscan_spi_bitstreams;
     };
     conda-artiq = import ./conda/artiq.nix { inherit pkgs; };
     conda-asyncserial = import ./conda/build.nix { inherit pkgs; } {
@@ -77,7 +77,7 @@ let
     };
   };
 
-  condaLinux = {
+  condaLinux = rec {
     conda-binutils-or1k = import ./conda/binutils.nix {
       inherit pkgs;
       inherit (mainPackages.binutils-or1k) version src;