Updating from trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19825

pkgs/development/libraries/librsync/default.nix

@@ -0,0 +1,20 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "librsync-0.9.7";
+  
+  src = fetchurl {
+    url = mirror://sourceforge/librsync/librsync-0.9.7.tar.gz;
+    sha256 = "1mj1pj99mgf1a59q9f2mxjli2fzxpnf55233pc1klxk2arhf8cv6";
+  };
+
+  # To allow x86_64 linking to the static lib to make a shared object
+  # like for the package 'duplicity'
+  CFLAGS="-fPIC";
+
+  meta = {
+    homepage = http://librsync.sourceforge.net/;
+    license = "LGPLv2+";
+    description = "Implementation of the rsync remote-delta algorithm";
+  };
+}

pkgs/development/libraries/sqlite/default.nix

@@ -1,6 +1,8 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, readline ? null, ncurses ? null }:
 
-stdenv.mkDerivation rec {
+assert readline != null -> ncurses != null;
+
+stdenv.mkDerivation {
   name = "sqlite-3.6.22";
 
   src = fetchurl {
@@ -8,9 +10,11 @@ stdenv.mkDerivation rec {
     sha256 = "1k5qyl0v2y4fpkh7vvxvb0irpnl71g0ffhfc3ksm40mrhcdq9qk8";
   };
 
+  buildInputs = [readline ncurses];
   configureFlags = "--enable-threadsafe";
 
   NIX_CFLAGS_COMPILE = "-DSQLITE_ENABLE_COLUMN_METADATA=1";
+  NIX_CFLAGS_LINK = if readline != null then "-lncurses" else "";
 
   meta = {
     homepage = http://www.sqlite.org/;