forked from M-Labs/nix-scripts
Revert "binutils-arm: armv7-unknown-linux-gnueabihf -> armv7-linux-gnueabihf"
rustc insists on -unknown.
This reverts commit d3c514ac7c
.
This commit is contained in:
parent
d3c514ac7c
commit
9b99ee9aad
|
@ -20,7 +20,7 @@ let
|
||||||
mainPackages = rec {
|
mainPackages = rec {
|
||||||
inherit (pythonDeps) asyncserial levenshtein pythonparser quamash pyqtgraph-qt5 misoc migen microscope jesd204b migen-axi lit outputcheck;
|
inherit (pythonDeps) asyncserial levenshtein pythonparser quamash pyqtgraph-qt5 misoc migen microscope jesd204b migen-axi lit outputcheck;
|
||||||
binutils-or1k = callPackage ./pkgs/binutils.nix { platform = "or1k"; target = "or1k-linux"; };
|
binutils-or1k = callPackage ./pkgs/binutils.nix { platform = "or1k"; target = "or1k-linux"; };
|
||||||
binutils-arm = callPackage ./pkgs/binutils.nix { platform = "arm"; target = "armv7-linux-gnueabihf"; };
|
binutils-arm = callPackage ./pkgs/binutils.nix { platform = "arm"; target = "armv7-unknown-linux-gnueabihf"; };
|
||||||
llvm-or1k = callPackage ./pkgs/llvm-or1k.nix {};
|
llvm-or1k = callPackage ./pkgs/llvm-or1k.nix {};
|
||||||
rustc = callPackage ./pkgs/rust
|
rustc = callPackage ./pkgs/rust
|
||||||
((stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
|
((stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
|
||||||
|
|
Loading…
Reference in New Issue