M-Labs
/
artiq-zynq
10
1
Fork 19
Code Issues 13 Pull Requests Releases Wiki Activity

xbuild -> cargo-xbuild

This commit is contained in:
Sebastien Bourdeauducq 2020-08-25 17:39:42 +08:00
parent 949adbd90a
commit d6ab23de1f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xbuild.nix → cargo-xbuild.nix
View File

@ -10,7 +10,7 @@ pkgs.rustPlatform.buildRustPackage rec {
sha256 = "08mpnj3l6bcm1jg22lw1gcs0lkm4320fwl4p5y1s44w64963kzf7"; sha256 = "08mpnj3l6bcm1jg22lw1gcs0lkm4320fwl4p5y1s44w64963kzf7";
}; };
patches = [./xbuild.patch]; patches = [ ./cargo-xbuild.patch ];
cargoSha256 = "1pj4x8y5vfpnn8vhxqqm3vicn29870r3jh0b17q3riq4vz1a2afp"; cargoSha256 = "1pj4x8y5vfpnn8vhxqqm3vicn29870r3jh0b17q3riq4vz1a2afp";

0
xbuild.patch → cargo-xbuild.patch
View File

4
shell.nix
View File

@ -5,7 +5,7 @@ let
rustPlatform = (import ./rustPlatform.nix { inherit pkgs; }); rustPlatform = (import ./rustPlatform.nix { inherit pkgs; });
artiqpkgs = import "${artiq-fast}/default.nix" { inherit pkgs; }; artiqpkgs = import "${artiq-fast}/default.nix" { inherit pkgs; };
vivado = import "${artiq-fast}/vivado.nix" { inherit pkgs; }; vivado = import "${artiq-fast}/vivado.nix" { inherit pkgs; };
xbuild = import ./xbuild.nix { inherit pkgs; }; cargo-xbuild = import ./cargo-xbuild.nix { inherit pkgs; };
in in
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
name = "artiq-zynq-env"; name = "artiq-zynq-env";
@ -16,7 +16,7 @@ in
pkgs.llvmPackages_9.llvm pkgs.llvmPackages_9.llvm
pkgs.llvmPackages_9.clang-unwrapped pkgs.llvmPackages_9.clang-unwrapped
pkgs.cacert pkgs.cacert
xbuild cargo-xbuild
pkgs.openocd pkgs.openocd
pkgs.openssh pkgs.rsync pkgs.openssh pkgs.rsync