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

Compare commits

base: M-Labs:fd25af0733e4e97924b01c5f40b25fb16b100587
Branches Tags
M-Labs:master
..
compare: M-Labs:56959775319f640fc062f78dc10783e597c2239f
Branches Tags
M-Labs:master

2 Commits
fd25af0733 ... 5695977531

Author SHA1 Message Date
Astro 5695977531 Revert "artiq-board.nix: move compilers into nativeBuildInputs" 
This reverts commit fd25af0733.
 2020-11-25 21:23:03 +01:00
Astro 2e62831998 Revert "artiq-fast: add strictDeps=true to fetchcargo.nix" 
This reverts commit 843da12452.
 2020-11-25 21:23:02 +01:00
2 changed files with 2 additions and 6 deletions
Show Stats Expand all files Collapse all files

7
artiq-fast/artiq-board.nix
View File

@ -56,18 +56,15 @@ pkgs.python3Packages.toPythonModule (pkgs.stdenv.mkDerivation rec {
version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; }); version = import ./pkgs/artiq-version.nix (with pkgs; { inherit stdenv fetchgit git; });
inherit src; inherit src;
phases = [ "buildPhase" "installCheckPhase" "installPhase" "checkPhase" ]; phases = [ "buildPhase" "installCheckPhase" "installPhase" "checkPhase" ];
nativeBuildInputs = [ buildInputs = [
vivado vivado
pkgs.gnumake pkgs.gnumake
(pkgs.python3.withPackages(ps: with ps; [ jinja2 numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq ]))
artiqpkgs.cargo artiqpkgs.cargo
artiqpkgs.rustc artiqpkgs.rustc
artiqpkgs.binutils-or1k artiqpkgs.binutils-or1k
artiqpkgs.llvm-or1k artiqpkgs.llvm-or1k
]; ];
buildInputs =
[ (pkgs.python3.withPackages (ps: with ps; [
jinja2 numpy artiqpkgs.migen artiqpkgs.microscope artiqpkgs.misoc artiqpkgs.jesd204b artiqpkgs.artiq
])) ];
buildPhase = buildPhase =
'' ''
export CARGO_HOME=${cargoVendored} export CARGO_HOME=${cargoVendored}

1
artiq-fast/fetchcargo.nix
View File

@ -3,7 +3,6 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${name}-vendor"; name = "${name}-vendor";
nativeBuildInputs = [ cacert git cargo cargo-vendor ]; nativeBuildInputs = [ cacert git cargo cargo-vendor ];
strictDeps = true;
inherit src; inherit src;
phases = "unpackPhase patchPhase installPhase"; phases = "unpackPhase patchPhase installPhase";