Merge from trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=29461

2 files changed, 9 insertions, 4 deletions

diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix
index 0cda358b8efbe..916c7600dfd0f 100644
--- a/pkgs/shells/bash-completion/default.nix
+++ b/pkgs/shells/bash-completion/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation {
   postInstall = ''
     rm $out/etc/profile.d/bash_completion.sh
     rmdir $out/etc/profile.d
+    sed -i -e "s|/etc/bash_completion|$out/etc/bash_completion|g" $out/etc/bash_completion
   '';
 
   meta = {
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index 5de0a2fae7df5..6f39d627bdb95 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison}:
+{stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison, bashCompletion ? null}:
 
 assert interactive -> readline != null;
 
@@ -47,18 +47,22 @@ stdenv.mkDerivation rec {
   buildNativeInputs = [bison]
     ++ stdenv.lib.optional (texinfo != null) texinfo
     ++ stdenv.lib.optional interactive readline;
-   
+
   postInstall = ''
     # Add an `sh' -> `bash' symlink.
     ln -s bash "$out/bin/sh"
 
+  '' + (if interactive && bashCompletion != null then ''
+    ensureDir "$out/etc"
+    echo >"$out/etc/bash_completion" '. "${bashCompletion}/etc/bash_completion"'
+  '' else ''
     # Install the completion examples.
     ensureDir "$out/etc"
     cp -v "examples/complete/bash_completion" "$out/etc"
 
     ensureDir "$out/etc/bash_completion.d"
     cp -v "examples/complete/complete.gnu-longopt" "$out/etc/bash_completion.d"
-  '';
+  '');
 
   meta = {
     homepage = http://www.gnu.org/software/bash/;
@@ -79,7 +83,7 @@ stdenv.mkDerivation rec {
 
     license = "GPLv3+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
     platforms = stdenv.lib.platforms.all;
   };