From 1ffce94d92e7ac020c6952fa0fd9ba434a532596 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 10 Jun 2020 12:05:01 +0800
Subject: [PATCH] conda: handle architecture-dependent packages in channel

---
 artiq-full/conda-channel.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/artiq-full/conda-channel.nix b/artiq-full/conda-channel.nix
index 4988303..27babb2 100644
--- a/artiq-full/conda-channel.nix
+++ b/artiq-full/conda-channel.nix
@@ -6,7 +6,7 @@ let
 in
   pkgs.runCommand "conda-channel" { }
     ''
-    mkdir -p $out/noarch
+    mkdir -p $out/noarch $out/linux-64
     for storepath in ${pkgs.lib.concatMapStringsSep " " builtins.toString (builtins.attrValues jobs)}; do
       hydra_build_products=$storepath/nix-support/hydra-build-products
       if [ -f $hydra_build_products ]; then
@@ -14,7 +14,8 @@ in
           type=`echo $line | cut -f2 -d " "`
           if [ $type == "conda" ]; then
             path=`echo $line | cut -f3 -d " "`
-            ln -s $path $out/noarch
+            arch=`echo $path | cut -f5 -d "/"`
+            ln -s $path $out/$arch
           fi
         done < $hydra_build_products
       fi