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

nextpnr: 2019.10.13 -> 2020.02.04

Browse Source
This commit is contained in:
Emily 2020-02-08 15:32:29 +00:00 committed by Austin Seipp
parent f43d9bf5ed
commit ff819cdd12
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,14 +14,14 @@ let
in in
with stdenv; mkDerivation rec { with stdenv; mkDerivation rec {
pname = "nextpnr"; pname = "nextpnr";
version = "2019.10.13"; version = "2020.02.04";
srcs = [ srcs = [
(fetchFromGitHub { (fetchFromGitHub {
owner = "YosysHQ"; owner = "YosysHQ";
repo = "nextpnr"; repo = "nextpnr";
rev = "c365dd1cabc3a4308ab9110534918623622c246b"; rev = "ca733561873cd54be047ae30a94efcd71b3f8be5";
sha256 = "1344pyq9xb5y1vxsnfgr488drfjsa6ls1jck0z9hwam6vg55s10r"; sha256 = "176drrq6w53qbwmnksa1b22w9qz3gd1db9hy2lyv8svbcdxd9qwp";
name = "nextpnr"; name = "nextpnr";
}) })
(fetchFromGitHub { (fetchFromGitHub {
@ -45,10 +45,11 @@ with stdenv; mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
cmakeFlags = cmakeFlags =
[ "-DARCH=generic;ice40;ecp5" [ "-DCURRENT_GIT_VERSION=${lib.substring 0 7 (lib.elemAt srcs 0).rev}"
"-DARCH=generic;ice40;ecp5"
"-DBUILD_TESTS=ON" "-DBUILD_TESTS=ON"
"-DICEBOX_ROOT=${icestorm}/share/icebox" "-DICEBOX_ROOT=${icestorm}/share/icebox"
"-DTRELLIS_ROOT=${trellis}/share/trellis" "-DTRELLIS_INSTALL_PREFIX=${trellis}"
"-DPYTRELLIS_LIBDIR=${trellis}/lib/trellis" "-DPYTRELLIS_LIBDIR=${trellis}/lib/trellis"
"-DUSE_OPENMP=ON" "-DUSE_OPENMP=ON"
# warning: high RAM usage # warning: high RAM usage
@ -58,12 +59,7 @@ with stdenv; mkDerivation rec {
++ (lib.optional (enableGui && stdenv.isDarwin) ++ (lib.optional (enableGui && stdenv.isDarwin)
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"); "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks");
# Fix the version number. This is a bit stupid (and fragile) in practice
# but works ok. We should probably make this overrideable upstream.
patchPhase = with builtins; '' patchPhase = with builtins; ''
substituteInPlace ./CMakeLists.txt \
--replace 'git log -1 --format=%h' 'echo ${substring 0 11 (elemAt srcs 0).rev}'
# use PyPy for icestorm if enabled # use PyPy for icestorm if enabled
substituteInPlace ./ice40/family.cmake \ substituteInPlace ./ice40/family.cmake \
--replace ''\'''${PYTHON_EXECUTABLE}' '${icestorm.pythonInterp}' --replace ''\'''${PYTHON_EXECUTABLE}' '${icestorm.pythonInterp}'