* Use bzip instead of gzip for downloaded archives.

* Combine most of the archives together into one file (static.bz2).
* Don't depend on Subversion directories, but single files only.
  Otherwise any Subversion operation may cause a rebuild because
  something in .svn changes.  It would be nice if .svn directories
  were filtered out when copying things to the store.
* Glibc tarball: removed all .so files, /bin and /sbin, etc., and put
  linux-headers in the Glibc tarball.

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

pkgs/stdenv/linux/scripts/add-symlink.sh

@@ -1,13 +0,0 @@
-chmod u+w $out/include
-(cd $out/include && ln -s $extra/include/* .) || exit 1
-
-cd $out
-find . -not -type l -exec $extra2/bin/chmod u+w {} \;
-find . -exec $patchelf --interpreter $out/lib/ld-linux.so.2 --shrink-rpath {} \; || true
-
-$extra2/bin/rm -rf bin
-
-$extra2/bin/cat ./lib/libc.so | $extra4/bin/sed "s|/nix/store/[a-z0-9]*-glibc|$out|g" > ./lib/libc.so
-$extra2/bin/cat ./lib/libpthread.so | $extra4/bin/sed "s|/nix/store/[a-z0-9]*-glibc|$out|g" > ./lib/libpthread.so
-
-rm $out/lib/*.so*

pkgs/stdenv/linux/scripts/builder-stdenv-initial.sh

@@ -6,5 +6,5 @@ PATH=$coreutils/bin
 mkdir $out
 
 cat > $out/setup <<EOF
-PATH=$coreutils/bin:$gnused/bin
-EOF
+PATH=$staticTools/bin
+EOF

pkgs/stdenv/linux/scripts/curl-unpack

@@ -3,6 +3,6 @@ set -e
 
 echo $curl
 
-$gunzip -d < $curl | $tar xvf -
+$bunzip2 -d < $curl | $tar xvf -
 
 $cp -prvd * $out

pkgs/stdenv/linux/scripts/download-script

@@ -4,7 +4,7 @@ echo "using curl executable $curl"
 
 $curl/bin/curl "$url" > .tmp
 
-$gunzip -d < .tmp | $tar xvf -
+$bunzip2 -d < .tmp | $tar xvf -
 
 $cp -prd * $out