summary refs log tree commit diff
path: root/pkgs/shells/bash
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-09-17 01:14:00 +0200
committerVladimír Čunát <vcunat@gmail.com>2016-09-17 01:16:24 +0200
commitbbadb1da2a852d1a1517c2ce21232dba49260d83 (patch)
tree95288110d307413b57007543751466a7c96180a5 /pkgs/shells/bash
parent02163da708fdae58e9769a169511949675f35d82 (diff)
downloadnixlib-bbadb1da2a852d1a1517c2ce21232dba49260d83.tar
nixlib-bbadb1da2a852d1a1517c2ce21232dba49260d83.tar.gz
nixlib-bbadb1da2a852d1a1517c2ce21232dba49260d83.tar.bz2
nixlib-bbadb1da2a852d1a1517c2ce21232dba49260d83.tar.lz
nixlib-bbadb1da2a852d1a1517c2ce21232dba49260d83.tar.xz
nixlib-bbadb1da2a852d1a1517c2ce21232dba49260d83.tar.zst
nixlib-bbadb1da2a852d1a1517c2ce21232dba49260d83.zip
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/bash')
-rw-r--r--pkgs/shells/bash/default.nix9
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;