From 9a951db8462a9e41c4aeded3a8d6ecd69acd1896 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 15 Jan 2021 16:07:53 -0600 Subject: 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 --- pkgs/development/compilers/yosys/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 9e1576434f5bd..7d2191f8f4567 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ stdenv, lib , abc-verifier , bash , bison @@ -43,13 +43,16 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ tcl readline libffi python3 bison flex protobuf zlib ]; + nativeBuildInputs = [ pkg-config bison flex ]; + buildInputs = [ tcl readline libffi python3 protobuf zlib ]; makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"]; - patchPhase = '' - patch -p1 < ${./plugin-search-dirs.patch} + patches = [ + ./plugin-search-dirs.patch + ]; + + postPatch = '' substituteInPlace ./Makefile \ --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}' @@ -94,7 +97,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { + meta = with lib; { description = "Open RTL synthesis framework and tools"; homepage = "http://www.clifford.at/yosys/"; license = licenses.isc; -- cgit 1.4.1