From e8601a4227519ba979e0785855c28b6adfce779e Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 26 Jan 2010 16:04:53 +0000 Subject: explicitly disable readline support for bash on darwin, hacky for now, to avoid massive rebuild svn path=/nixpkgs/branches/stdenv-updates/; revision=19678 --- pkgs/shells/bash/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/shells/bash') diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 2b373548ac1b..8e3ce9586720 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -2,7 +2,7 @@ assert interactive -> readline != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "bash-4.1"; src = fetchurl { @@ -71,4 +71,5 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.ludo ]; }; -} +} // (if stdenv.isDarwin then { configureFlags = if interactive then "--with-installed-readline" else "--disable-readline"; } else {}) ) + -- cgit 1.4.1