4 files changed, 37 insertions, 14 deletions
diff --git a/pkgs/development/libraries/java/jetty-util/default.nix b/pkgs/development/libraries/java/jetty-util/default.nix
new file mode 100644
index 0000000000000..8f1f676c10708
--- /dev/null
+++ b/pkgs/development/libraries/java/jetty-util/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "jetty-util-6.1.16";
+  src = fetchurl {
+    url = http://repository.codehaus.org/org/mortbay/jetty/jetty-util/6.1.16/jetty-util-6.1.16.jar;
+    sha256 = "1ld94lb5dk7y6sjg1rq8zdk97wiy56ik5vbgy7yjj4f6rz5pxbyq";
+  };
+  buildCommand = ''
+    ensureDir $out/share/java
+    cp $src $out/share/java/$name.jar
+  '';
+}
diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix
index d7a18ffa1a368..828061fa796be 100644
--- a/pkgs/development/libraries/java/smack/default.nix
+++ b/pkgs/development/libraries/java/smack/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "smack-3_1_0";
+  name = "smack-3_0_4";
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_1_0.tar.gz;
-    sha256 = "02kn3i7py6ilnchz0yn4v2g0sh8msxcw61kankqrz2a65852i28i";
+    url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_0_4.tar.gz;
+    sha256 = "075nn7vwfjr2a9j6ycikkbssxhai82vpvll9123r83rar3ds3li6";
   };  
 }
diff --git a/pkgs/development/libraries/redland/1.0.9.nix b/pkgs/development/libraries/redland/1.0.9.nix
index 313a8f28a6faa..93606ad0eb581 100644
--- a/pkgs/development/libraries/redland/1.0.9.nix
+++ b/pkgs/development/libraries/redland/1.0.9.nix
@@ -1,7 +1,7 @@
 args: with args;
 
 let name = "redland-${version}";
-in 
+in
 
 stdenv.mkDerivation {
   inherit name;
@@ -10,15 +10,24 @@ stdenv.mkDerivation {
     url = "mirror://sf/librdf/${name}.tar.gz";
     sha256 = "aa90ded84f5dd4cc2330bf79d139e00ceb93c6a9b94d17e1a93449ad579e1524";
   };
-  
+
   buildInputs = [pkgconfig];
-  
+
   propagatedBuildInputs = [
     bdb openssl libxslt perl mysql postgresql sqlite curl pcre libxml2
     librdf_raptor librdf_rasqal
   ];
-    
+
   configureFlags = "--with-threads --with-bdb=${bdb}";
-  
-  patchPhase = "sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl";
+
+  patchPhase =
+  ''
+    sed -e 1s@/usr@${perl}@ -i utils/touch-mtime.pl
+
+    # Redland 1.0.9 uses an internal pre-processor symbol SQLITE_API
+    # that collides with a symbol of the same name in sqlite 3.6.19.
+    # This is a quick fix for the problem. A real solution needs to be
+    # implemented upstream, though.
+    find . -type f -exec sed -i -e 's/SQLITE_API/REDLAND_SQLITE_API/g' {} \;
+  '';
 }
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 7ccb398d3ea0a..2f5ed3f5d4278 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -1,21 +1,22 @@
-{stdenv, fetchurl, readline, static ? false}:
+{stdenv, fetchurl, readline, tcl, static ? false}:
 
 stdenv.mkDerivation rec {
-  name = "sqlite-3.6.16";
+  name = "sqlite-3.6.19";
 
   # Note: don't use the "amalgamation" source release, since it
   # doesn't install sqlite3.pc.
   src = fetchurl {
     url = "http://www.sqlite.org/${name}.tar.gz";
-    sha256 = "1kadzd5c82x3i7vd0cfqxc3r8a2smc04fhsxpl07jxjlva4khvqc";
+    sha256 = "7d8649c44fb97b874aa59144faaeb2356ec1fc6a8a7baa1d16e9ff5f1e097003";
   };
 
-  buildInputs = [readline];
+  buildInputs = [readline tcl];
 
   configureFlags = ''
+    CFLAGS=-O3
     --enable-load-extension
     ${if static then "--disable-shared --enable-static" else ""}
-    --disable-amalgamation
+    --enable-amalgamation
     --enable-threadsafe
     --disable-cross-thread-connections
     --disable-tcl