From 3c67f862119568e295fd54b16029dfcf1d5c0a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 26 Aug 2015 22:04:27 +0200 Subject: [PATCH] openocd: enable support for CMSIS-DAP debuggers I.e., add 'hidapi' to buildInputs. Build tested. --- pkgs/development/tools/misc/openocd/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 258f40a69608..ea52fff64ccb 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"