3 files changed, 31 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix
new file mode 100644
index 00000000000..4667f44b188
--- /dev/null
+++ b/pkgs/development/libraries/libftdi/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, libusb}:
+
+stdenv.mkDerivation rec {
+  name = "libftdi-0.16";
+  
+  src = fetchurl {
+    url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz";
+    sha256 = "1n12lcvpzmkph12gmg7i7560s0yly2gjgwhxh2h2inq93agg1xv2";
+  };
+
+  buildInputs = [ libusb ];
+
+  propagatedBuildInputs = [ libusb ];
+
+  meta = {
+    description = "A library to talk to FTDI chips using libusb";
+    homepage = http://www.intra2net.com/en/developer/libftdi/;
+    license = "LGPLv2.1";
+  };
+}
diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index 301d7eb8e41..4c5532aa9a8 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, libftdi}:
 
 stdenv.mkDerivation {
   name = "openocd-0.2.0";
@@ -8,6 +8,11 @@ stdenv.mkDerivation {
     sha256 = "1qdl2a2mxhl07xz32l9nxjvmf16b0717aqlrhd28akn6si3jps54";
   };
 
+
+  configureFlags = [ "--enable-ft2232_libftdi" "--disable-werror" ];
+
+  buildInputs = [ libftdi ];
+
   meta = {
     homepage = http://openocd.berlios.de;
     description = "Open On Chip Debugger";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 394ef990b92..ada6f8a177b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2702,7 +2702,7 @@ let
   };
 
   openocd = import ../development/tools/misc/openocd {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv libftdi;
   };
 
   oprofile = import ../development/tools/profiling/oprofile {
@@ -3617,6 +3617,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  libftdi = import ../development/libraries/libftdi {
+    inherit fetchurl stdenv libusb;
+  };
+
   libgcrypt = import ../development/libraries/libgcrypt {
     inherit fetchurl stdenv libgpgerror;
   };