* Finally got stdenv-nix-linux working again. Still not perfect,

  though.
* libxml2: upgrade to latest.
* octavefront/rna: keep debug info.

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

13 files changed, 34 insertions, 31 deletions

diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index ce772d07a78..c1438e6d0e8 100755
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -5,7 +5,7 @@ buildinputs="$binutils"
 
 tar xvfj $src
 
-if test "$enforcePurity" = "1"; then
+if test "$noSysDirs" = "1"; then
     # Disable the standard include directories.
     cd gcc-*
     cat >> ./gcc/cppdefault.h <<EOF
@@ -29,7 +29,7 @@ mkdir build
 cd build
 ../gcc-*/configure --prefix=$out --enable-languages="$langs"
 
-if test "$enforcePurity" = "1"; then
+if test "$noSysDirs" = "1"; then
     # Patch some of the makefiles to force linking against our own glibc.
     . $NIX_GCC/nix-support/add-flags # add glibc/gcc flags
     extraflags="-Wl,-s $NIX_CFLAGS_COMPILE $NIX_CFLAGS_LINK"
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index 9e79b21cd7a..dea31911048 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, enforcePurity ? true
+{ stdenv, fetchurl, noSysDirs
 , langC ? true, langCC ? true, langF77 ? false
 }:
 
@@ -16,5 +16,5 @@ derivation {
 #    url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.3.3/gcc-3.3.3.tar.bz2;
 #    md5 = "3c6cfd9fcd180481063b4058cf6faff2";
 #  };
-  inherit stdenv enforcePurity langC langCC langF77;
+  inherit stdenv noSysDirs langC langCC langF77;
 }
diff --git a/pkgs/development/interpreters/perl/builder.sh b/pkgs/development/interpreters/perl/builder.sh
index 14c1d3146b8..e36e0738f50 100755
--- a/pkgs/development/interpreters/perl/builder.sh
+++ b/pkgs/development/interpreters/perl/builder.sh
@@ -23,6 +23,11 @@ fi
 
 patch -p1 < $srcPatch
 
-./Configure -de -Dcc=gcc -Dprefix=$out -Uinstallusrbinperl
+if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
+    GLIBC=$(cat $NIX_GCC/nix-support/orig-glibc)
+    extraflags="-Dlocincpth=$GLIBC/include -Dloclibpth=$GLIBC/lib"
+fi
+
+./Configure -de -Dcc=gcc -Dprefix=$out -Uinstallusrbinperl $extraflags
 make
 make install
diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh
index b671d269cbf..e2423ad37c2 100755
--- a/pkgs/development/libraries/glibc/builder.sh
+++ b/pkgs/development/libraries/glibc/builder.sh
@@ -2,6 +2,7 @@
 
 # glibc cannot have itself in its rpath.
 export NIX_NO_SELF_RPATH=1
+buildinputs="$patch"
 . $stdenv/setup
 
 tar xvfj $glibcSrc
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 6af83b3f72e..6106e92812f 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurl, kernelHeaders}:
+{stdenv, fetchurl, kernelHeaders, patch}:
+
+assert patch != null;
 
 derivation {
   name = "glibc-2.3.2";
@@ -18,5 +20,5 @@ derivation {
   # later releases of glibc won't need this.
   vaargsPatch = ./glibc-2.3.2-sscanf-1.patch;
 
-  inherit stdenv kernelHeaders;
+  inherit stdenv kernelHeaders patch;
 }
diff --git a/pkgs/development/libraries/libxml2/builder.sh b/pkgs/development/libraries/libxml2/builder.sh
index 7d597905327..d787dee7071 100755
--- a/pkgs/development/libraries/libxml2/builder.sh
+++ b/pkgs/development/libraries/libxml2/builder.sh
@@ -3,7 +3,7 @@
 buildinputs="$zlib"
 . $stdenv/setup
 
-tar xvfz $src
+tar xvfj $src
 cd libxml2-*
 ./configure --prefix=$out
 make
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 3e2fb8b13e5..4eb33f53d01 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -3,12 +3,12 @@
 assert !isNull zlib;
 
 derivation {
-  name = "libxml2-2.6.2";
+  name = "libxml2-2.6.7";
   system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://rpmfind.net/pub/libxml/libxml2-2.6.2.tar.gz;
-    md5 = "56e7f74d3d44cc16790ad08624faef64";
+    url = ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/libxml2-2.6.7.tar.bz2;
+    md5 = "bdbef92cbdc5b4bd0365313ba22b75ce";
   };
   stdenv = stdenv;
   zlib = zlib;
diff --git a/pkgs/development/libraries/libxml2/libxml2-2.6.5.nix b/pkgs/development/libraries/libxml2/libxml2-2.6.5.nix
deleted file mode 100644
index a3a4e0df36d..00000000000
--- a/pkgs/development/libraries/libxml2/libxml2-2.6.5.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl, zlib}:
-
-assert !isNull zlib;
-
-derivation {
-  name = "libxml2-2.6.5";
-  system = stdenv.system;
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://rpmfind.net/pub/libxml/libxml2-2.6.5.tar.gz;
-    md5 = "0ac5dd9902c9bf20f7bc50de1034d49f";
-  };
-  stdenv = stdenv;
-  zlib = zlib;
-}
diff --git a/pkgs/development/libraries/rna/builder.sh b/pkgs/development/libraries/rna/builder.sh
index a7ba75723fd..60ac15542e5 100755
--- a/pkgs/development/libraries/rna/builder.sh
+++ b/pkgs/development/libraries/rna/builder.sh
@@ -3,6 +3,9 @@
 buildinputs="$zlib"
 . $stdenv/setup
 
+export NIX_STRIP_DEBUG=
+export NIX_CFLAGS_COMPILE="-g $NIX_CFLAGS_COMPILE"
+
 tar xvfz $src
 cd rna-*
 ./configure --prefix=$out
diff --git a/pkgs/development/libraries/xft/builder.sh b/pkgs/development/libraries/xft/builder.sh
index 2a2850ee7a5..085974877de 100755
--- a/pkgs/development/libraries/xft/builder.sh
+++ b/pkgs/development/libraries/xft/builder.sh
@@ -1,5 +1,7 @@
 #! /bin/sh -e
 
+set -x
+
 buildinputs="$pkgconfig $fontconfig $x11"
 . $stdenv/setup
 
diff --git a/pkgs/development/tools/misc/binutils/builder.sh b/pkgs/development/tools/misc/binutils/builder.sh
index f76eb534c55..6de59a675d7 100755
--- a/pkgs/development/tools/misc/binutils/builder.sh
+++ b/pkgs/development/tools/misc/binutils/builder.sh
@@ -6,7 +6,7 @@ tar xvfj $src
 cd binutils-*
 
 # Clear the default library search path.
-if test "$enforcePurity" = "1"; then
+if test "$noSysDirs" = "1"; then
     echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt
 fi
 
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 3f027d90fcc..63039877d6f 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, enforcePurity ? true}:
+{stdenv, fetchurl, noSysDirs}:
 
 derivation {
   name = "binutils-2.14";
@@ -8,5 +8,5 @@ derivation {
     url = ftp://ftp.nluug.nl/pub/gnu/binutils/binutils-2.14.tar.bz2;
     md5 = "2da8def15d28af3ec6af0982709ae90a";
   };
-  inherit stdenv enforcePurity;
+  inherit stdenv noSysDirs;
 }
diff --git a/pkgs/development/tools/misc/octavefront/builder.sh b/pkgs/development/tools/misc/octavefront/builder.sh
index ccdd540cf45..c24c9d1b123 100755
--- a/pkgs/development/tools/misc/octavefront/builder.sh
+++ b/pkgs/development/tools/misc/octavefront/builder.sh
@@ -1,15 +1,20 @@
 #! /bin/sh -e
 
+set -x
+
 buildinputs="$autoconf $g77 $texinfo $bison $flex $gperf $rna $aterm"
 . $stdenv/setup
 
-g77orig=$(cat $g77/orig-gcc)
+g77orig=$(cat $g77/nix-support/orig-gcc)
 export NIX_LDFLAGS="-rpath $g77orig/lib $NIX_LDFLAGS"
 
+export NIX_STRIP_DEBUG=
+export NIX_CFLAGS_COMPILE="-g $NIX_CFLAGS_COMPILE"
+
 tar xvfz $src
 cd octavefront-*
 ./autogen.sh
 ./configure --prefix=$out --disable-readline --enable-rna=$rna --enable-aterm
 make
 make install
-strip -S $out/lib/*/*.a
+#strip -S $out/lib/*/*.a