Browse Source

conda: fix access to bscan-spi-bitstreams

pull/64/head
Sebastien Bourdeauducq 3 months ago
parent
commit
f595103f17
  1. 2
      artiq-fast/conda/bscan-spi-bitstreams.nix
  2. 2
      artiq-fast/default.nix

2
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

2
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; } {

Loading…
Cancel
Save