git.iko.soy/typeable/nixpkgs
on master help sign in
yosys: some more small fixes from review feedback

Fixes up the usage of patches/postInstall. Also removes `stdenv.lib` and other minor tweaks. Based on feedback from Sandro and Mihai. Signed-off-by: Austin Seipp <aseipp@pobox.com>

commit9a951db8462a9e41c4aeded3a8d6ecd69acd1896 authorAustin Seipp <aseipp@pobox.com> dateFri 15 Jan 2021, 16:07 (6 years ago) parent365ef90
1 file changed+9−6
pkgs/development/compilers/yosys/default.nix+9−6
pkgs/development/compilers/yosys/default.nix+9−6
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ stdenv, lib
22, abc-verifier
33, bash
44, bison
@@ -43,13 +43,16 @@ stdenv.mkDerivation rec {
4343 };
4444
4545 enableParallelBuilding = true;
46− nativeBuildInputs = [ pkg-config ];
47− buildInputs = [ tcl readline libffi python3 bison flex protobuf zlib ];
46+ nativeBuildInputs = [ pkg-config bison flex ];
47+ buildInputs = [ tcl readline libffi python3 protobuf zlib ];
4848
4949 makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"];
5050
51− patchPhase = ''
52− patch -p1 < ${./plugin-search-dirs.patch}
51+ patches = [
52+ ./plugin-search-dirs.patch
53+ ];
54+
55+ postPatch = ''
5356 substituteInPlace ./Makefile \
5457 --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}'
5558
@@ -94,7 +97,7 @@ stdenv.mkDerivation rec {
9497
9598 setupHook = ./setup-hook.sh;
9699
97− meta = with stdenv.lib; {
100+ meta = with lib; {
98101 description = "Open RTL synthesis framework and tools";
99102 homepage = "http://www.clifford.at/yosys/";
100103 license = licenses.isc;