* stdenv-nix-linux should more-or-less work again now.

svn path=/nixpkgs/trunk/; revision=826

pkgs/development/tools/misc/binutils/builder.sh

@@ -1,17 +1,17 @@
-#! /bin/sh
+#! /bin/sh -e
 
-. $stdenv/setup || exit 1
+. $stdenv/setup
 
-tar xvfj $src || exit 1
-cd binutils-* || exit 1
+tar xvfj $src
+cd binutils-*
 
 # Clear the default library search path.
-if test "$noSysDirs" == "1"; then
-    echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt || exit 1
+if test "$enforcePurity" = "1"; then
+    echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt
 fi
 
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
+./configure --prefix=$out
+make
+make install
 
-strip -S $out/lib/*.a || exit 1
+strip -S $out/lib/*.a

pkgs/development/tools/misc/binutils/default.nix

@@ -1,4 +1,6 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl, enforcePurity ? true}:
+
+derivation {
   name = "binutils-2.14";
   system = stdenv.system;
   builder = ./builder.sh;
@@ -6,6 +8,5 @@
     url = ftp://ftp.nluug.nl/pub/gnu/binutils/binutils-2.14.tar.bz2;
     md5 = "2da8def15d28af3ec6af0982709ae90a";
   };
-  stdenv = stdenv;
-  noSysDirs = stdenv.noSysDirs;
+  inherit stdenv enforcePurity;
 }