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

yosys: cherry-pick some minor fixes (cf d81e4d9f6)

Browse Source 
d81e4d9f66e0d1a1a6d contained some minor fixes to the yosys derivation
that make it a little easier to read and maintain. Incorporate those.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2021-01-15 10:26:16 -06:00
parent ec1830e696
commit 365ef90263
No known key found for this signature in database
GPG Key ID: 25D2038DEB08021D
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/compilers/yosys/default.nix
View File

@ -5,7 +5,7 @@
, fetchFromGitHub , fetchFromGitHub
, flex , flex
, libffi , libffi
, pkgconfig , pkg-config
, protobuf , protobuf
, python3 , python3
, readline , readline
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ tcl readline libffi python3 bison flex protobuf zlib ]; buildInputs = [ tcl readline libffi python3 bison flex protobuf zlib ];
makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"]; makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"];
@ -51,15 +51,10 @@ stdenv.mkDerivation rec {
patchPhase = '' patchPhase = ''
patch -p1 < ${./plugin-search-dirs.patch} patch -p1 < ${./plugin-search-dirs.patch}
substituteInPlace ./Makefile \ substituteInPlace ./Makefile \
--replace 'CXX = clang' "" \
--replace 'LD = clang++' 'LD = $(CXX)' \
--replace 'CXX = gcc' "" \
--replace 'LD = gcc' 'LD = $(CXX)' \
--replace 'ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"' 'ABCMKARGS =' \
--replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}' --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}'
substituteInPlace ./misc/yosys-config.in \
--replace '/bin/bash' '${bash}/bin/bash' chmod +x ./misc/yosys-config.in
patchShebangs tests patchShebangs tests ./misc/yosys-config.in
''; '';
preBuild = let preBuild = let
@ -77,7 +72,7 @@ stdenv.mkDerivation rec {
exit 1 exit 1
fi fi
if ! grep -q "YOSYS_VER := ${version}" Makefile; then if ! grep -q "YOSYS_VER := $version" Makefile; then
echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing." echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing."
exit 1 exit 1
fi fi