* 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

7 files changed, 14 insertions, 21 deletions

diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh
index b671d269cbff4..e2423ad37c292 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 6af83b3f72e71..6106e92812f7d 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 7d59790532796..d787dee7071ad 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 3e2fb8b13e564..4eb33f53d012c 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 a3a4e0df36d07..0000000000000
--- 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 a7ba75723fd4c..60ac15542e5b3 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 2a2850ee7a5ab..085974877deb3 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