From d4d19e34db054ed8c10e8b704e28f1ad71556c67 Mon Sep 17 00:00:00 2001 From: Erlend Hamberg Date: Mon, 17 Jun 2019 09:54:44 +0200 Subject: [PATCH] Don't use autoreconfHook for building Erlang/OTP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is in preparation for adding Erlang/OTP 22 which no longer has a `configure.in` and fails to build with the current `generic-builder.nix`, but it should work for all supported, previous versions of Erlang (R18–R21) as well. Fixes #62775 --- pkgs/development/interpreters/erlang/generic-builder.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index bc0b728ecce..914c3a0f5cf 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,5 +1,5 @@ { pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused -, libxml2, libxslt, ncurses, openssl, perl, autoreconfHook +, libxml2, libxslt, ncurses, openssl, perl, autoconf , openjdk ? null # javacSupport , unixODBC ? null # odbcSupport , libGLU_combined ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport @@ -48,7 +48,7 @@ in stdenv.mkDerivation ({ inherit src version; - nativeBuildInputs = [ autoreconfHook makeWrapper perl gnum4 libxslt libxml2 ]; + nativeBuildInputs = [ autoconf makeWrapper perl gnum4 libxslt libxml2 ]; buildInputs = [ ncurses openssl ] ++ optionals wxSupport wxPackages2