about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2004-03-30 12:37:17 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2004-03-30 12:37:17 +0000
commit04c272508c32f9e837e31f8e07b32e0fdd8a4922 (patch)
tree9bf982fe35342fd4728a222627a34c1458424a07 /pkgs
parent4fc3dd4a5ac559e61d6983cd8e139a5ea4ed6f26 (diff)
* Fix brokenness due to automatic transformations.
svn path=/nixpkgs/trunk/; revision=878
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/shells/bash/builder.sh3
-rw-r--r--pkgs/tools/networking/curl/default.nix1
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/shells/bash/builder.sh b/pkgs/shells/bash/builder.sh
index 13e79ff5e28bb..7ee2af07e4461 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 d7627982d6a58..16f806b81628d 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";