M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

binaries -> board-support

This commit is contained in:
Sebastien Bourdeauducq 2019-02-22 23:16:17 +08:00
parent 5be4588e7d
commit 6ad2f9f19e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/artiq-board.nix
View File

@ -55,7 +55,7 @@ in pkgs.python3Packages.buildPythonPackage rec {
''; '';
installPhase = installPhase =
'' ''
TARGET_DIR=$out/${pkgs.python3Packages.python.sitePackages}/artiq/binaries/${target}-${variant} TARGET_DIR=$out/${pkgs.python3Packages.python.sitePackages}/artiq/board-support/${target}-${variant}
mkdir -p $TARGET_DIR mkdir -p $TARGET_DIR
cp artiq_${target}/${variant}/gateware/top.bit $TARGET_DIR cp artiq_${target}/${variant}/gateware/top.bit $TARGET_DIR
cp artiq_${target}/${variant}/software/bootloader/bootloader.bin $TARGET_DIR cp artiq_${target}/${variant}/software/bootloader/bootloader.bin $TARGET_DIR

4
artiq/conda-artiq-board.nix
View File

@ -37,9 +37,9 @@ let
cat << EOF > $out/fake-conda/build.sh cat << EOF > $out/fake-conda/build.sh
#!/bin/bash #!/bin/bash
set -e set -e
SOC_PREFIX=\$PREFIX/site-packages/artiq/binaries/${target}-${variant} SOC_PREFIX=\$PREFIX/site-packages/artiq/board-support/${target}-${variant}
mkdir -p \$SOC_PREFIX mkdir -p \$SOC_PREFIX
cp ${boardBinaries}/${pkgs.python3Packages.python.sitePackages}/artiq/binaries/${target}-${variant}/* \$SOC_PREFIX cp ${boardBinaries}/${pkgs.python3Packages.python.sitePackages}/artiq/board-support/${target}-${variant}/* \$SOC_PREFIX
EOF EOF
chmod 755 $out/fake-conda/build.sh chmod 755 $out/fake-conda/build.sh
''; '';