diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-09-17 01:14:00 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-09-17 01:16:24 +0200 |
commit | bbadb1da2a852d1a1517c2ce21232dba49260d83 (patch) | |
tree | 95288110d307413b57007543751466a7c96180a5 /pkgs/shells | |
parent | 02163da708fdae58e9769a169511949675f35d82 (diff) |
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).
Diffstat (limited to 'pkgs/shells')
-rw-r--r-- | pkgs/shells/bash/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index be9f15dd1fa8..a401628dabd0 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -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; |