public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use autoreconfHook for building Erlang/OTP

Browse Source 
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
This commit is contained in:
Erlend Hamberg 2019-06-17 09:54:44 +02:00 committed by GitHub
parent fac8d2d01b
commit d4d19e34db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@ -1,5 +1,5 @@
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused { pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
, libxml2, libxslt, ncurses, openssl, perl, autoreconfHook , libxml2, libxslt, ncurses, openssl, perl, autoconf
, openjdk ? null # javacSupport , openjdk ? null # javacSupport
, unixODBC ? null # odbcSupport , unixODBC ? null # odbcSupport
, libGLU_combined ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport , libGLU_combined ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
@ -48,7 +48,7 @@ in stdenv.mkDerivation ({
inherit src version; inherit src version;
nativeBuildInputs = [ autoreconfHook makeWrapper perl gnum4 libxslt libxml2 ]; nativeBuildInputs = [ autoconf makeWrapper perl gnum4 libxslt libxml2 ];
buildInputs = [ ncurses openssl ] buildInputs = [ ncurses openssl ]
++ optionals wxSupport wxPackages2 ++ optionals wxSupport wxPackages2