artiq-full/conda-channel: fix artiq-fast path

2 years ago · 72fb469b0b
parent a6ea6e3666
commit 72fb469b0b
2 changed files with 3 additions and 3 deletions
--- 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; };
  }
--- 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" { }
    ''