M-Labs
/
nix-scripts
9
0
Fork 8
Code Issues 6 Pull Requests 3 Releases Wiki Activity

Revert "conda-windows-binutils-arm: likewise" 

This reverts commit 1d7b1e9175.
pull/33/head
Astro 2020-07-24 09:35:06 +08:00
parent 89d700a796
commit 7f32f8e438
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
artiq-fast/default.nix
View File

@ -123,24 +123,22 @@ let
}; };
}; };
windowsBinutils = targetName: target:
import ./windows/binutils.nix {
inherit pkgs target;
inherit (mainPackages."binutils-${targetName}") version src;
};
condaWindowsExperimental = rec { condaWindowsExperimental = rec {
conda-windows-binutils-or1k = import ./conda-windows/binutils.nix rec { windows-binutils-or1k = import ./windows/binutils.nix {
inherit pkgs;
inherit (mainPackages.binutils-or1k) version src;
target = "or1k-linux";
};
conda-windows-binutils-or1k = import ./conda-windows/binutils.nix {
inherit pkgs; inherit pkgs;
inherit (mainPackages.binutils-or1k) version; inherit (mainPackages.binutils-or1k) version;
target = "or1k-linux"; target = "or1k-linux";
windows-binutils = windowsBinutils "or1k" target; windows-binutils = windows-binutils-or1k;
}; };
conda-windows-binutils-arm = import ./conda-windows/binutils.nix rec { conda-windows-binutils-arm = import ./conda-windows/binutils.nix {
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;