From e973188bcc9f35dbd12f00c0ef5dd9240da1d9d3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 7 May 2018 00:16:50 -0500 Subject: [PATCH] souffle: fix on darwin Fixes #39854 --- pkgs/development/compilers/souffle/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 5289540e944c..099a591b407d 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, boost, bison, flex, openjdk, doxygen, perl, graphviz, libtool, lsb-release, ncurses, zlib, sqlite }: +{ stdenv, fetchFromGitHub +, boost, bison, flex, openjdk, doxygen +, perl, graphviz, libtool, ncurses, zlib, sqlite +, autoreconfHook }: stdenv.mkDerivation rec { version = "1.2.0"; @@ -11,12 +14,10 @@ stdenv.mkDerivation rec { sha256 = "1g8yvm40h102mab8lacpl1cwgqsw1js0s1yn4l84l9fjdvlh2ygd"; }; + nativeBuildInputs = [ autoreconfHook bison flex ]; + buildInputs = [ - autoconf automake boost bison flex openjdk - # Used for 1.2.0 - libtool lsb-release ncurses zlib sqlite - # Used for docs - doxygen perl graphviz + boost openjdk ncurses zlib sqlite doxygen perl graphviz ]; patchPhase = '' @@ -29,8 +30,6 @@ stdenv.mkDerivation rec { # for boost and failing there, so we tell it what's what here. configureFlags = [ "--with-boost-libdir=${boost}/lib" ]; - preConfigure = "./bootstrap"; - meta = with stdenv.lib; { description = "A translator of declarative Datalog programs into the C++ language"; homepage = "http://souffle-lang.github.io/";