From cf693caa08dd19ada3c417c35025d1aeb542599d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 26 Oct 2006 22:30:27 +0000 Subject: [PATCH] * Another example of an inline hook. svn path=/nixpkgs/trunk/; revision=6864 --- pkgs/shells/bash/builder.sh | 4 ---- pkgs/shells/bash/default.nix | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 pkgs/shells/bash/builder.sh diff --git a/pkgs/shells/bash/builder.sh b/pkgs/shells/bash/builder.sh deleted file mode 100644 index 56ca1745dae4..000000000000 --- a/pkgs/shells/bash/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup -genericBuild -cd $out/bin -ln -s bash sh diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 17e71f2fcc2f..be22f045cd91 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -2,12 +2,14 @@ stdenv.mkDerivation { name = "bash-3.2"; - builder = ./builder.sh; + src = fetchurl { url = http://ftp.gnu.org/pub/gnu/bash/bash-3.2.tar.gz; md5 = "00bfa16d58e034e3c2aa27f390390d30"; }; + postInstall = "ln -s bash $out/bin/sh"; + patches = [ # Fix a nasty bug in bash-3.2. ./bash32-001.patch