summary refs log tree commit diff
path: root/pkgs/development/tools/misc/openocd/default.nix
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2015-08-26 22:04:27 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2015-08-26 22:06:08 +0200
commit3c67f862119568e295fd54b16029dfcf1d5c0a64 (patch)
tree62a9ffa5be3818abde6856e0e25661d79baec9ed /pkgs/development/tools/misc/openocd/default.nix
parent1a13d28151cb1dc0125509c0d68246ef5be2b5a4 (diff)
downloadnixpkgs-3c67f862119568e295fd54b16029dfcf1d5c0a64.tar
nixpkgs-3c67f862119568e295fd54b16029dfcf1d5c0a64.tar.gz
nixpkgs-3c67f862119568e295fd54b16029dfcf1d5c0a64.tar.bz2
nixpkgs-3c67f862119568e295fd54b16029dfcf1d5c0a64.tar.lz
nixpkgs-3c67f862119568e295fd54b16029dfcf1d5c0a64.tar.xz
nixpkgs-3c67f862119568e295fd54b16029dfcf1d5c0a64.tar.zst
nixpkgs-3c67f862119568e295fd54b16029dfcf1d5c0a64.zip
openocd: enable support for CMSIS-DAP debuggers
I.e., add 'hidapi' to buildInputs. Build tested.
Diffstat (limited to 'pkgs/development/tools/misc/openocd/default.nix')
-rw-r--r--pkgs/development/tools/misc/openocd/default.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index 258f40a6960..ea52fff64cc 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -1,8 +1,4 @@
-{ stdenv, fetchurl, libftdi, libusb1, pkgconfig }:
-
-# TODO: Add "hidapi" as dependency to gain access to CMSIS-DAP debuggers.
-# Support should be auto-detected, but if not, pass "--enable-cmsis-dap" to
-# configure.
+{ stdenv, fetchurl, libftdi, libusb1, pkgconfig, hidapi }:
 
 stdenv.mkDerivation rec {
   name = "openocd-${version}";
@@ -13,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0hzlnm19c4b35vsxs6ik94xbigv3ykdgr8gzrdir6sqmkan44w43";
   };
 
-  buildInputs = [ libftdi libusb1 pkgconfig ];
+  buildInputs = [ libftdi libusb1 pkgconfig hidapi ];
 
   configureFlags = [
     "--enable-jtag_vpi"