newell
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Pull Requests Activity

conda-windows-binutils-arm: likewise

This commit is contained in:
Astro 2020-07-22 08:24:37 +08:00
parent 3409eb3c11
commit 1d7b1e9175
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
artiq-fast/default.nix
View File

@ -123,22 +123,24 @@ let
}; };
}; };
condaWindowsExperimental = rec { windowsBinutils = targetName: target:
windows-binutils-or1k = import ./windows/binutils.nix { import ./windows/binutils.nix {
inherit pkgs; inherit pkgs target;
inherit (mainPackages.binutils-or1k) version src; inherit (mainPackages."binutils-${targetName}") version src;
target = "or1k-linux";
}; };
conda-windows-binutils-or1k = import ./conda-windows/binutils.nix {
condaWindowsExperimental = rec {
conda-windows-binutils-or1k = import ./conda-windows/binutils.nix rec {
inherit pkgs; inherit pkgs;
inherit (mainPackages.binutils-or1k) version; inherit (mainPackages.binutils-or1k) version;
target = "or1k-linux"; target = "or1k-linux";
windows-binutils = windows-binutils-or1k; windows-binutils = windowsBinutils "or1k" target;
}; };
conda-windows-binutils-arm = import ./conda-windows/binutils.nix { conda-windows-binutils-arm = import ./conda-windows/binutils.nix rec {
inherit pkgs; inherit pkgs;
inherit (mainPackages.binutils-or1k) version src; inherit (mainPackages.binutils-or1k) version src;
target = "armv7-unknown-linux-gnueabihf"; target = "armv7-unknown-linux-gnueabihf";
windows-binutils = windowsBinutils "arm" target;
}; };
conda-windows-llvm-or1k = import ./conda-windows/llvm-or1k.nix { conda-windows-llvm-or1k = import ./conda-windows/llvm-or1k.nix {
inherit pkgs; inherit pkgs;