forked from M-Labs/nix-scripts
artiq-full: fix conda paths
This commit is contained in:
parent
37e70bbda1
commit
ffaa3f74ec
|
@ -40,7 +40,7 @@ let
|
||||||
EOF
|
EOF
|
||||||
chmod 755 $out/fake-conda/build.sh
|
chmod 755 $out/fake-conda/build.sh
|
||||||
'';
|
'';
|
||||||
conda-artiq-board = import ./fast/conda-build.nix { inherit pkgs; } {
|
conda-artiq-board = import ./fast/conda/build.nix { inherit pkgs; } {
|
||||||
name = "conda-artiq-board-${target}-${variant}";
|
name = "conda-artiq-board-${target}-${variant}";
|
||||||
src = fakeCondaSource;
|
src = fakeCondaSource;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ pkgs, sipyco, asyncserial, artiq }:
|
{ pkgs, sipyco, asyncserial, artiq }:
|
||||||
let
|
let
|
||||||
condaBuild = import ./fast/conda-build.nix { inherit pkgs; };
|
condaBuild = import ./fast/conda/build.nix { inherit pkgs; };
|
||||||
condaFakeSource = import ./fast/conda-fake-source.nix { inherit pkgs; };
|
condaFakeSource = import ./fast/conda/fake-source.nix { inherit pkgs; };
|
||||||
dualPackage = (
|
dualPackage = (
|
||||||
{ name, version, src, pythonOptions ? {}, condaOptions ? {}}:
|
{ name, version, src, pythonOptions ? {}, condaOptions ? {}}:
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue