From 72fb469b0b8edf6d45435b11d39eef2924e4128c Mon Sep 17 00:00:00 2001
From: Stephan Maka <sm@m-labs.hk>
Date: Mon, 15 Feb 2021 14:18:25 +0100
Subject: [PATCH] artiq-full/conda-channel: fix artiq-fast path

---
 artiq-full.nix               | 2 +-
 artiq-full/conda-channel.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/artiq-full.nix b/artiq-full.nix
index 93a7188..aa0f1fe 100644
--- a/artiq-full.nix
+++ b/artiq-full.nix
@@ -243,5 +243,5 @@ in
       src = generatedNix;
       constituents = [];
     };
-    conda-channel = import ./artiq-full/conda-channel.nix { inherit pkgs; } { inherit jobs; };
+    conda-channel = import ./artiq-full/conda-channel.nix { inherit pkgs artiq-fast; } { inherit jobs; };
   }
diff --git a/artiq-full/conda-channel.nix b/artiq-full/conda-channel.nix
index 644888e..06132e4 100644
--- a/artiq-full/conda-channel.nix
+++ b/artiq-full/conda-channel.nix
@@ -1,8 +1,8 @@
-{ pkgs }:
+{ pkgs, artiq-fast }:
 { jobs }:
 
 let 
-  condaBuilderEnv = import <artiq-fast/conda/builder-env.nix> { inherit pkgs; };
+  condaBuilderEnv = import ../artiq-fast/conda/builder-env.nix { inherit pkgs; };
 in
   pkgs.runCommand "conda-channel" { }
     ''