nextpnr: 2019.08.31 -> 2019.09.28
This commit is contained in:
parent
ee96061946
commit
9f7165de66
|
@ -14,13 +14,14 @@ let
|
||||||
in
|
in
|
||||||
with stdenv; mkDerivation rec {
|
with stdenv; mkDerivation rec {
|
||||||
pname = "nextpnr";
|
pname = "nextpnr";
|
||||||
version = "2019.08.31";
|
version = "2019.09.28";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "yosyshq";
|
owner = "yosyshq";
|
||||||
repo = "nextpnr";
|
repo = "nextpnr";
|
||||||
rev = "c0b7379e8672b6263152d5e340e62f22179fdc8b";
|
rev = "7cd1e0495122847611b17a8d1f007d97a05b288c";
|
||||||
sha256 = "174n962xiwyzy53cn192h9rq95h951k3xy6bs43p5ya592ai5mjh";
|
sha256 = "13y739l92plb22g73jf35pyh3y94b2vq0i65r9c31r2rb7fw4bbl";
|
||||||
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs
|
nativeBuildInputs
|
||||||
|
@ -40,8 +41,6 @@ with stdenv; mkDerivation rec {
|
||||||
"-DUSE_OPENMP=ON"
|
"-DUSE_OPENMP=ON"
|
||||||
# warning: high RAM usage
|
# warning: high RAM usage
|
||||||
"-DSERIALIZE_CHIPDB=OFF"
|
"-DSERIALIZE_CHIPDB=OFF"
|
||||||
# use PyPy for icestorm if enabled
|
|
||||||
"-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}"
|
|
||||||
]
|
]
|
||||||
++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF")
|
++ (lib.optional (!enableGui) "-DBUILD_GUI=OFF")
|
||||||
++ (lib.optional (enableGui && stdenv.isDarwin)
|
++ (lib.optional (enableGui && stdenv.isDarwin)
|
||||||
|
@ -52,6 +51,10 @@ with stdenv; mkDerivation rec {
|
||||||
patchPhase = with builtins; ''
|
patchPhase = with builtins; ''
|
||||||
substituteInPlace ./CMakeLists.txt \
|
substituteInPlace ./CMakeLists.txt \
|
||||||
--replace 'git log -1 --format=%h' 'echo ${substring 0 11 src.rev}'
|
--replace 'git log -1 --format=%h' 'echo ${substring 0 11 src.rev}'
|
||||||
|
|
||||||
|
# use PyPy for icestorm if enabled
|
||||||
|
substituteInPlace ./ice40/family.cmake \
|
||||||
|
--replace ''\'''${PYTHON_EXECUTABLE}' '${icestorm.pythonInterp}'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue