readline70: init at 7.0p0

Also switch bash-4.4 to it, as it's unable to link with older readline
versions (only bashInteractive is affected).
This commit is contained in:
Vladimír Čunát
2016-09-17 01:14:00 +02:00
parent 02163da708
commit bbadb1da2a
3 changed files with 74 additions and 3 deletions

View File

@@ -1,6 +1,8 @@
{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, binutils ? null, bison }:
{ stdenv, fetchurl, readline70 ? null, interactive ? false, texinfo ? null
, binutils ? null, bison
}:
assert interactive -> readline != null;
assert interactive -> readline70 != null;
assert stdenv.isDarwin -> binutils != null;
let
@@ -67,9 +69,10 @@ stdenv.mkDerivation rec {
# Note: Bison is needed because the patches above modify parse.y.
nativeBuildInputs = [bison]
++ optional (texinfo != null) texinfo
++ optional interactive readline
++ optional stdenv.isDarwin binutils;
buildInputs = optional interactive readline70;
# Bash randomly fails to build because of a recursive invocation to
# build `version.h'.
enableParallelBuilding = false;