diff options
author | ajs124 <ajs124@users.noreply.github.com> | 2022-04-09 01:01:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-09 01:01:29 +0200 |
commit | 4e23a0b384d5ba8baa66497385bb2ebbd43f097e (patch) | |
tree | a0ac177c5899c99aa3dde16678833f2951f809a3 | |
parent | f76d87f16d29507abba3eb7635e8183aa7480c9e (diff) | |
parent | aa3fd4aed55fedeb9264ce5364efd2269c8c5254 (diff) |
Merge pull request #167844 from eliasnaur/openocd-patch
openocd: fix segfault caused by libusb incompatibility
-rw-r--r-- | pkgs/development/embedded/openocd/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/embedded/openocd/default.nix b/pkgs/development/embedded/openocd/default.nix index c2f7d231b1a5f..6b4fa92389460 100644 --- a/pkgs/development/embedded/openocd/default.nix +++ b/pkgs/development/embedded/openocd/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, fetchpatch , fetchurl , pkg-config , hidapi @@ -21,6 +22,15 @@ stdenv.mkDerivation rec { buildInputs = [ hidapi libftdi1 libusb1 ] ++ lib.optional stdenv.isLinux libgpiod; + patches = [ + # Patch is upstream, so can be removed when OpenOCD 0.12.0 or later is released. + (fetchpatch + { + url = "https://github.com/openocd-org/openocd/commit/cff0e417da58adef1ceef9a63a99412c2cc87ff3.patch"; + sha256 = "Xxzf5miWy4S34sbQq8VQdAbY/oqGyhL/AJxiEPRuj3Q="; + }) + ]; + configureFlags = [ "--enable-jtag_vpi" "--enable-usb_blaster_libftdi" |