Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8ce4463d4a9c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c93a7f4d812e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 17, 2019

  1. Don't use autoreconfHook for building Erlang/OTP 

    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
    @ehamberg
    ehamberg authored Jun 17, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ljharb Jordan Harband
    GPG key ID: 9F6A681E35EF8B56
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d4d19e3 View commit details

Commits on Jun 18, 2019

  1. Merge pull request #63295 from ehamberg/patch-2 

    Don't use autoreconfHook for building Erlang/OTP
    @LnL7
    LnL7 authored Jun 18, 2019
    Copy the full SHA
    c93a7f4 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/interpreters/erlang/generic-builder.nix
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/erlang/generic-builder.nix
View file
Original file line number Diff line number Diff line change
@@ -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