From 04c272508c32f9e837e31f8e07b32e0fdd8a4922 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 30 Mar 2004 12:37:17 +0000
Subject: [PATCH] * Fix brokenness due to automatic transformations.

svn path=/nixpkgs/trunk/; revision=878
---
 pkgs/shells/bash/builder.sh            | 3 ++-
 pkgs/tools/networking/curl/default.nix | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/bash/builder.sh b/pkgs/shells/bash/builder.sh
index 13e79ff5e28b..7ee2af07e446 100644
--- a/pkgs/shells/bash/builder.sh
+++ b/pkgs/shells/bash/builder.sh
@@ -1,2 +1,3 @@
+. $stdenv/setup
 genericBuild
-(cd $out/bin && ln -s bash sh) || exit 1
+(cd $out/bin && ln -s bash sh)
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index d7627982d6a5..16f806b81628 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation {
   name = "curl-7.11.1";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://curl.haxx.se/download/curl-7.11.1.tar.bz2;
     md5 = "c2af7c3364a1a8839516f74961b6bd11";