* propagated-build-inputs should now be placed in $out/nix-support.

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

pkgs/development/libraries/glibc/builder.sh

@@ -2,25 +2,25 @@
 
 # glibc cannot have itself in its rpath.
 export NIX_NO_SELF_RPATH=1
-. $stdenv/setup || exit 1
+. $stdenv/setup
 
-tar xvfj $glibcSrc || exit 1
-(cd glibc-* && tar xvfj $linuxthreadsSrc) || exit 1
+tar xvfj $glibcSrc
+(cd glibc-* && tar xvfj $linuxthreadsSrc)
 
-(cd glibc-* && patch -p1 < $vaargsPatch) || exit 1
+(cd glibc-* && patch -p1 < $vaargsPatch)
 
-mkdir build || exit 1
-cd build || exit 1
-LDFLAGS=-Wl,-S ../glibc-*/configure --prefix=$out --enable-add-ons --disable-profile || exit 1
+mkdir build
+cd build
+LDFLAGS=-Wl,-S ../glibc-*/configure --prefix=$out --enable-add-ons --disable-profile
 
-make || exit 1
-make install || exit 1
-#make localedata/install-locales || exit 1
-strip -S $out/lib/*.a $out/lib/*.so $out/lib/gconv/*.so
-strip -s $out/bin/* $out/sbin/* $out/libexec/*
+make
+make install
+#make localedata/install-locales
+strip -S $out/lib/*.a $out/lib/*.so $out/lib/gconv/*.so || true
+strip -s $out/bin/* $out/sbin/* $out/libexec/* || true
 
-ln -sf /etc/ld.so.cache $out/etc/ld.so.cache || exit 1
+ln -sf /etc/ld.so.cache $out/etc/ld.so.cache
 
-(cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1
+(cd $out/include && ln -s $kernelHeaders/include/* .)
 
 exit 0

pkgs/development/libraries/glibc/default.nix

@@ -1,4 +1,6 @@
-{stdenv, fetchurl, kernelHeaders}: derivation {
+{stdenv, fetchurl, kernelHeaders}:
+
+derivation {
   name = "glibc-2.3.2";
   system = stdenv.system;
   builder = ./builder.sh;
@@ -16,6 +18,5 @@
   # later releases of glibc won't need this.
   vaargsPatch = ./glibc-2.3.2-sscanf-1.patch;
 
-  stdenv = stdenv;
-  kernelHeaders = kernelHeaders;
+  inherit stdenv kernelHeaders;
 }