git.iko.soy/typeable/nixpkgs
on master help sign in
yosys: cherry-pick some minor fixes (cf d81e4d9f6)

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>

commit365ef90263f991f329fdfc599d33e1f0b2cf8c99 authorAustin Seipp <aseipp@pobox.com> dateFri 15 Jan 2021, 10:26 (6 years ago) parentec1830e
1 file changed+6−11
pkgs/development/compilers/yosys/default.nix+6−11
pkgs/development/compilers/yosys/default.nix+6−11
@@ -5,7 +5,7 @@
55, fetchFromGitHub
66, flex
77, libffi
8−, pkgconfig
8+, pkg-config
99, protobuf
1010, python3
1111, readline
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343 };
4444
4545 enableParallelBuilding = true;
46− nativeBuildInputs = [ pkgconfig ];
46+ nativeBuildInputs = [ pkg-config ];
4747 buildInputs = [ tcl readline libffi python3 bison flex protobuf zlib ];
4848
4949 makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"];
@@ -51,15 +51,10 @@ stdenv.mkDerivation rec {
5151 patchPhase = ''
5252 patch -p1 < ${./plugin-search-dirs.patch}
5353 substituteInPlace ./Makefile \
54− --replace 'CXX = clang' "" \
55− --replace 'LD = clang++' 'LD = $(CXX)' \
56− --replace 'CXX = gcc' "" \
57− --replace 'LD = gcc' 'LD = $(CXX)' \
58− --replace 'ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"' 'ABCMKARGS =' \
5954 --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}'
60− substituteInPlace ./misc/yosys-config.in \
61− --replace '/bin/bash' '${bash}/bin/bash'
62− patchShebangs tests
55+
56+ chmod +x ./misc/yosys-config.in
57+ patchShebangs tests ./misc/yosys-config.in
6358 '';
6459
6560 preBuild = let
@@ -77,7 +72,7 @@ stdenv.mkDerivation rec {
7772 exit 1
7873 fi
7974
80− if ! grep -q "YOSYS_VER := ${version}" Makefile; then
75+ if ! grep -q "YOSYS_VER := $version" Makefile; then
8176 echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing."
8277 exit 1
8378 fi