Updating from trunk

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

pkgs/tools/misc/bc/default.nix

@@ -12,4 +12,9 @@ stdenv.mkDerivation {
   configureFlags = "--with-readline";
 
   buildInputs = [flex readline];
+
+  meta = {
+    description = "GNU software calculator";
+    homepage = http://www.gnu.org/software/bc/;
+  };
 }

pkgs/tools/misc/gnokii/default.nix

@@ -8,6 +8,9 @@ let
     glib pkgconfig
   ];
 in
+
+assert a.stdenv ? glibc;
+
 rec {
   src = a.fetchUrlFromSrcInfo s;
 
@@ -26,12 +29,12 @@ rec {
     export CFLAGS="-ggdb -O0 -include ${a.stdenv.glibc}/include/locale.h"
     export CXXFLAGS="-ggdb -O0"
 
-    patch -p 1 < ${/tmp/patch}
   '' [ "minInit" "doUnpack" ];
       
   inherit(s) name;
   meta = {
     description = "Cellphone tool";
+    homepage = http://www.gnokii.org;
     maintainers = [a.lib.maintainers.raskin];
     platforms = with a.lib.platforms; linux;
   };

pkgs/tools/misc/mdbtools/git.nix

@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, fetchgit, glib, readline, bison, flex, pkgconfig,
+  libiconv, autoconf, automake, libtool }:
+
+stdenv.mkDerivation {
+  name = "mdbtools-git";
+
+  src = fetchgit {
+    url = "http://github.com/brianb/mdbtools.git";
+    rev = "5ac44b69d9375cca3e1055b70fd22abf7fbf17ab";
+    sha256 = "094e6b480c6fda3a000d0d8539b209d2d7c204a440660a21c11f2e1c9b3aa345";
+  };
+
+  buildInputs = [glib readline bison flex pkgconfig libiconv autoconf automake
+    libtool];
+
+  preConfigure = ''
+    sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c
+    export NIX_LDFLAGS="$NIX_LDFLAGS -liconv"
+    ./autogen.sh
+  '';
+
+  meta = {
+    description = ".mdb (MS Access) format tools";
+  };
+}

pkgs/tools/misc/ttf2pt1/ttf2pt1-cl-pdf.nix

@@ -0,0 +1,20 @@
+{ttf2pt1, lib, fetchurl, unzip}:
+
+lib.overrideDerivation ttf2pt1 
+(x:
+{
+  name = "ttf2pt1-cl-pdf";
+  src = fetchurl {
+    url = "http://www.fractalconcept.com/fcweb/download/ttf2pt1-src.zip";
+    sha256 = "1w6kxgnrj3x67lf346bswmcqny9lmyhbnkp6kv99l6wfaq4gs82b";
+  };
+  buildInputs = x.buildInputs ++ [unzip];
+  sourceRoot = "ttf2pt1-cl-pdf";
+  preBuild = ''
+    chmod a+x scripts/*
+  '';
+  meta = x.meta // {
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
+  };
+})

pkgs/tools/misc/usbmuxd/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, cmake, libplist, libusb1, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "usbmuxd-1.0.5";
+
+  src = fetchurl {
+    url = "http://marcansoft.com/uploads/usbmuxd/${name}.tar.bz2";
+    sha256 = "130h5hk2qhki5xflcindx0prrgm5h7aqhbygrpasvr6030k6bkiv";
+  };
+
+  buildInputs = [ cmake pkgconfig ];
+  propagatedBuildInputs = [ libusb1 libplist ];
+
+  patchPhase = "sed -e 's,/lib/udev,lib/udev,' -i udev/CMakeLists.txt";
+
+  cmakeFlags = ''-DLIB_SUFFIX='';
+  meta = {
+    homepage = http://marcansoft.com/blog/iphonelinux/usbmuxd/;
+    description = "USB Multiplex Daemon (for talking to iPhone or iPod)";
+    longDescription = ''
+      usbmuxd: USB Multiplex Daemon. This bit of software is in charge of
+      talking to your iPhone or iPod Touch over USB and coordinating access to
+      its services by other applications.'';
+    inherit (libusb1.meta) platforms;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}