* Merged the last of the trunk, preparing for switch...

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10847

pkgs/applications/misc/fetchmail/default.nix

@@ -6,6 +6,10 @@ stdenv.mkDerivation {
     sha256 = "5612f9af367f641e0efd084f44fcf1889669e711dbd8c60f6b7953e494d1b09b";
   };
 
+  buildInputs = [ openssl ];
+
+  configureFlags = "--with-ssl=${openssl}";
+
   patches = [ ./security-fix.patch ];
 
   meta = {

pkgs/applications/misc/procmail/default.nix

@@ -1,18 +1,21 @@
 args: with args;
 stdenv.mkDerivation {
   name="procmail-3.22";
-  buildInputs = [stdenv.gcc.libc];
+
+  buildInputs = [ stdenv.gcc.libc ];
+
   installPhase = "
     ensureDir \$out/bin
-    find . -exec sed -e \"s%^RM[ \\t]*=%RM=`type -f rm | awk '{print $3;}'`%\" -i '{}' ';'
-    sed -e 's%\\(LDFLAGS = \$(LDFLAGS1) -lnsl -ldl -lc\\)%\\1 -m%' -i src/Makefile
+    sed -e \"s%^RM.*$%RM=`type -f rm | awk '{print $3;}'` -f%\" -i Makefile
     sed -e \"s%^BASENAME.*%\BASENAME=$out%\" -i Makefile
+    sed -e \"s%^LIBS=.*%LIBS=-lm%\" -i Makefile
     make DESTDIR=\$out install
    ";
-  phases ="installPhase";
+
+  phases = "unpackPhase installPhase";
+
   src = fetchurl {
     url = ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-3.22.tar.gz;
     sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08";
   };
-  o=62;
 }