public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from trunk

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
This commit is contained in:
Shea Levy
2011-09-23 16:58:45 +00:00
parent 99863cb87b 8770aaea0e
commit 01df54f5cc
443 changed files with 7115 additions and 2178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/shells/bash/default.nix
View File

@@ -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;
};