M-Labs/HeavyX
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2019-04-26 17:42:03 +08:00
parent 40eced0136
commit 3b2f6a222e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default.nix
View File

@ -1,4 +1,4 @@
{ pkgs ? import <nixpkgs> {}}: { pkgs }:
(import ./derivations.nix { inherit pkgs; }) // { (import ./derivations.nix { inherit pkgs; }) // {
vivado = import ./eda/vivado.nix { inherit pkgs; }; vivado = import ./eda/vivado.nix { inherit pkgs; };
} }

2
eda/vivado.nix
View File

@ -33,5 +33,5 @@ in
mkdir $out mkdir $out
cp *.dcp *.rpt *.bit $out cp *.dcp *.rpt *.bit $out
''; '';
}; };
} }

4
examples/helloworld_kintex7.nix
View File

@ -2,7 +2,7 @@
, hx ? import ../default.nix { inherit pkgs; }}: , hx ? import ../default.nix { inherit pkgs; }}:
let let
vivadoInput = pkgs.runCommand "test-vivado-input" { vivadoInput = pkgs.runCommand "helloworld-vivado-input" {
buildInputs = [ (pkgs.python3.withPackages(ps: [hx.nmigen hx.heavycomps])) hx.yosys ]; buildInputs = [ (pkgs.python3.withPackages(ps: [hx.nmigen hx.heavycomps])) hx.yosys ];
} }
'' ''
@ -43,6 +43,6 @@ let
''; '';
in in
hx.vivado.buildBitstream { hx.vivado.buildBitstream {
name = "test-design"; name = "helloworld-bitstream";
src = vivadoInput; src = vivadoInput;
} }