shareef
/
artiq-zynq
forked from M-Labs/artiq-zynq
1
0
Fork 0
Code Pull Requests Activity

cargo-xbuild: cleanup

This commit is contained in:
Sebastien Bourdeauducq 2020-08-25 16:59:57 +08:00
parent 49689dedf1
commit 949adbd90a
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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 ); xbuild = import ./xbuild.nix { inherit pkgs; };
in in
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
name = "artiq-zynq-env"; name = "artiq-zynq-env";

9
xbuild.nix
View File

@ -1,12 +1,9 @@
let { pkgs }:
pkgs = import <nixpkgs> {};
in
with pkgs;
pkgs.rustPlatform.buildRustPackage rec { pkgs.rustPlatform.buildRustPackage rec {
pname = "cargo-xbuild"; pname = "cargo-xbuild";
version = "0.5.21"; version = "0.5.21";
src = fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "rust-osdev"; owner = "rust-osdev";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
@ -17,7 +14,7 @@ pkgs.rustPlatform.buildRustPackage rec {
cargoSha256 = "1pj4x8y5vfpnn8vhxqqm3vicn29870r3jh0b17q3riq4vz1a2afp"; cargoSha256 = "1pj4x8y5vfpnn8vhxqqm3vicn29870r3jh0b17q3riq4vz1a2afp";
meta = with stdenv.lib; { meta = with pkgs.stdenv.lib; {
description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc";
homepage = "https://github.com/rust-osdev/cargo-xbuild"; homepage = "https://github.com/rust-osdev/cargo-xbuild";
license = with licenses; [ mit asl20 ]; license = with licenses; [ mit asl20 ];