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

add ARM binutils to the development environment (Zynq)

This commit is contained in:
Sebastien Bourdeauducq 2019-08-25 09:27:12 +08:00
parent 11b91906e2
commit aa30c7b539
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artiq-fast/default.nix
View File

@ -19,7 +19,8 @@ let
}) {} boards; }) {} boards;
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-or1k.nix {}; binutils-or1k = callPackage ./pkgs/binutils.nix { platform = "or1k"; target = "or1k-linux"; };
binutils-arm = callPackage ./pkgs/binutils.nix { platform = "arm"; target = "arm-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) {

5
artiq-fast/pkgs/binutils-or1k.nix → artiq-fast/pkgs/binutils.nix
View File

@ -1,10 +1,11 @@
{ stdenv, buildPackages { stdenv, buildPackages
, fetchurl, zlib , fetchurl, zlib
, platform, target
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
basename = "binutils"; basename = "binutils";
platform = "or1k"; inherit platform;
version = "2.30"; version = "2.30";
name = "${basename}_${platform}-${version}"; name = "${basename}_${platform}-${version}";
src = fetchurl { src = fetchurl {
@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"; sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg";
}; };
configureFlags = configureFlags =
[ "--enable-shared" "--enable-deterministic-archives" "--target=or1k-linux"]; [ "--enable-shared" "--enable-deterministic-archives" "--target=${target}"];
outputs = [ "out" "info" "man" ]; outputs = [ "out" "info" "man" ];
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = [ zlib ]; buildInputs = [ zlib ];

1
artiq-fast/shell-dev.nix
View File

@ -12,6 +12,7 @@ in
pkgs.cargo pkgs.cargo
artiqpkgs.rustc artiqpkgs.rustc
artiqpkgs.binutils-or1k artiqpkgs.binutils-or1k
artiqpkgs.binutils-arm
artiqpkgs.llvm-or1k artiqpkgs.llvm-or1k
artiqpkgs.openocd artiqpkgs.openocd
]; ];