binaries -> board-support

artiq/artiq-board.nix

@@ -55,7 +55,7 @@ in pkgs.python3Packages.buildPythonPackage rec {
     '';
   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
     cp artiq_${target}/${variant}/gateware/top.bit $TARGET_DIR
     cp artiq_${target}/${variant}/software/bootloader/bootloader.bin $TARGET_DIR

artiq/conda-artiq-board.nix

@@ -37,9 +37,9 @@ let
     cat << EOF > $out/fake-conda/build.sh
     #!/bin/bash
     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
-    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
     chmod 755 $out/fake-conda/build.sh
     '';