forked from M-Labs/nix-scripts
conda-windows: use compiled llvm-or1k for llvmlite-artiq
This commit is contained in:
parent
9733ec3509
commit
e347cb7c4b
|
@ -123,7 +123,7 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
condaWindowsExperimental = {
|
condaWindowsExperimental = rec {
|
||||||
conda-windows-binutils-or1k = import ./conda-windows/binutils.nix {
|
conda-windows-binutils-or1k = import ./conda-windows/binutils.nix {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
inherit (mainPackages.binutils-or1k) version src;
|
inherit (mainPackages.binutils-or1k) version src;
|
||||||
|
@ -140,9 +140,7 @@ let
|
||||||
src = mainPackages.llvm-or1k.llvm-src;
|
src = mainPackages.llvm-or1k.llvm-src;
|
||||||
};
|
};
|
||||||
conda-windows-llvmlite-artiq = import ./conda-windows/llvmlite-artiq.nix {
|
conda-windows-llvmlite-artiq = import ./conda-windows/llvmlite-artiq.nix {
|
||||||
inherit pkgs;
|
inherit pkgs conda-windows-llvm-or1k;
|
||||||
# TODO: stop using the legacy package after https://github.com/m-labs/artiq/issues/1473 is fixed
|
|
||||||
inherit (condaWindowsLegacy) conda-windows-llvm-or1k;
|
|
||||||
inherit (mainPackages.llvmlite-artiq) version src;
|
inherit (mainPackages.llvmlite-artiq) version src;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue