newell
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Pull Requests Activity

conda: fix access to bscan-spi-bitstreams

This commit is contained in:
Sebastien Bourdeauducq 2021-07-26 17:21:57 +08:00
parent 2355ba148a
commit f595103f17
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq-fast/conda/bscan-spi-bitstreams.nix
View File

@ -6,7 +6,7 @@ let
mkdir -p $out/fake-conda; mkdir -p $out/fake-conda;
# work around yet more idiotic conda behavior - build breaks if write permissions aren't set on source files. # 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 pushd workaround-conda
tar cf $out/src.tar . tar cf $out/src.tar .
popd popd

2
artiq-fast/default.nix
View File

@ -76,7 +76,7 @@ let
}; };
conda-bscan-spi-bitstreams = import ./conda/bscan-spi-bitstreams.nix { conda-bscan-spi-bitstreams = import ./conda/bscan-spi-bitstreams.nix {
inherit pkgs; 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-artiq = import ./conda/artiq.nix { inherit pkgs; };
conda-asyncserial = import ./conda/build.nix { inherit pkgs; } { conda-asyncserial = import ./conda/build.nix { inherit pkgs; } {