JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nextpnr: remove obsolete trellis hack

Browse Source
This commit is contained in:
Emily 2019-08-19 22:02:34 -07:00 committed by Austin Seipp
parent a5ac052dd3
commit 35994c61d6
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/compilers/nextpnr/default.nix
View File

@ -11,19 +11,6 @@
let
boostPython = boost.override { python = python3; enablePython = true; };
# This is a massive hack. For now, Trellis doesn't really support
# installation through an already-built package; you have to build it once to
# get the tools, then reuse the build directory to build nextpnr -- the
# 'install' phase doesn't install everything it needs. This will be fixed in
# the future but for now we can do this horrific thing.
trellisRoot = trellis.overrideAttrs (_: {
installPhase = ''
mkdir -p $out
cp *.so ..
cd ../../.. && cp -R trellis database $out/
'';
});
in
stdenv.mkDerivation rec {
pname = "nextpnr";
@ -47,7 +34,8 @@ stdenv.mkDerivation rec {
cmakeFlags =
[ "-DARCH=generic;ice40;ecp5"
"-DICEBOX_ROOT=${icestorm}/share/icebox"
"-DTRELLIS_ROOT=${trellisRoot}/trellis"
"-DTRELLIS_ROOT=${trellis}/share/trellis"
"-DPYTRELLIS_LIBDIR=${trellis}/lib/trellis"
"-DUSE_OPENMP=ON"
# warning: high RAM usage
"-DSERIALIZE_CHIPDB=OFF"