From 53a8a415ac5eca0ae16fd0c1e456584e83e5015f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 22 Sep 2020 21:29:07 +0100 Subject: [PATCH] cvc3: fix build against bison 3.7 for some reason bison 3.7 output references $x_defs.h files under the name $x.hpp. create symlinks to make this work. --- pkgs/applications/science/logic/cvc3/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index ff481fd7ab46..f6bb7d441c3f 100644 --- a/pkgs/applications/science/logic/cvc3/default.nix +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -13,9 +13,14 @@ stdenv.mkDerivation rec { patches = [ ./cvc3-2.4.1-gccv6-fix.patch ]; - preConfigure = '' + postPatch = '' sed -e "s@ /bin/bash@bash@g" -i Makefile.std find . -exec sed -e "s@/usr/bin/perl@${perl}/bin/perl@g" -i '{}' ';' + + # bison 3.7 workaround + for f in parsePL parseLisp parsesmtlib parsesmtlib2 ; do + ln -s ../parser/''${f}_defs.h src/include/''${f}.hpp + done ''; meta = with stdenv.lib; {