From f595103f178434d924c86ffc68ab81ab325fa114 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Mon, 26 Jul 2021 17:21:57 +0800
Subject: [PATCH] conda: fix access to bscan-spi-bitstreams

---
 artiq-fast/conda/bscan-spi-bitstreams.nix | 2 +-
 artiq-fast/default.nix                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/artiq-fast/conda/bscan-spi-bitstreams.nix b/artiq-fast/conda/bscan-spi-bitstreams.nix
index e70379c..ba78405 100644
--- a/artiq-fast/conda/bscan-spi-bitstreams.nix
+++ b/artiq-fast/conda/bscan-spi-bitstreams.nix
@@ -6,7 +6,7 @@ let
     mkdir -p $out/fake-conda;
 
     # work around yet more idiotic conda behavior - build breaks if write permissions aren't set on source files.
-    cp --no-preserve=mode,ownership -R ${bscan_spi_bitstreams} workaround-conda
+    cp --no-preserve=mode,ownership -L -R ${bscan_spi_bitstreams} workaround-conda
     pushd workaround-conda
     tar cf $out/src.tar .
     popd
diff --git a/artiq-fast/default.nix b/artiq-fast/default.nix
index 46be656..8f74b10 100644
--- a/artiq-fast/default.nix
+++ b/artiq-fast/default.nix
@@ -76,7 +76,7 @@ let
     };
     conda-bscan-spi-bitstreams = import ./conda/bscan-spi-bitstreams.nix {
       inherit pkgs;
-      inherit (mainPackages.openocd) bscan_spi_bitstreams;
+      bscan_spi_bitstreams = "${mainPackages.openocd}/share/bscan-spi-bitstreams";
     };
     conda-artiq = import ./conda/artiq.nix { inherit pkgs; };
     conda-asyncserial = import ./conda/build.nix { inherit pkgs; } {