Browse Source

cleanup

pull/1/head
parent
commit
3b2f6a222e
  1. 2
      default.nix
  2. 2
      eda/vivado.nix
  3. 4
      examples/helloworld_kintex7.nix

2
default.nix

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

2
eda/vivado.nix

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

4
examples/helloworld_kintex7.nix

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