Revert "Revert "openocd: Fix FTDI channel configuration for SheevaPlug""

This reverts commit b2623d3a9b5607b5f5e6dd6412fa134bd1875f8c. The revert
was an error since there was an override in my environment fetching a
more recent version of openocd.

+10 -1
+10 -1
pkgs/development/tools/misc/openocd/default.nix
··· 1 - { stdenv, lib, fetchurl, libftdi1, libusb1, pkgconfig, hidapi }: 2 3 stdenv.mkDerivation rec { 4 pname = "openocd"; ··· 8 url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2"; 9 sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk"; 10 }; 11 12 nativeBuildInputs = [ pkgconfig ]; 13 buildInputs = [ libftdi1 libusb1 hidapi ];
··· 1 + { stdenv, lib, fetchurl, fetchpatch, libftdi1, libusb1, pkgconfig, hidapi }: 2 3 stdenv.mkDerivation rec { 4 pname = "openocd"; ··· 8 url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2"; 9 sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk"; 10 }; 11 + 12 + patches = [ 13 + # Fix FTDI channel configuration for SheevaPlug 14 + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837989 15 + (fetchpatch { 16 + url = "https://salsa.debian.org/electronics-team/openocd/raw/9a94335daa332a37a51920f87afbad4d36fad2d5/debian/patches/fix-sheeva.patch"; 17 + sha256 = "01x021fagwvgxdpzk7psap7ryqiya4m4mi4nqr27asbmb3q46g5r"; 18 + }) 19 + ]; 20 21 nativeBuildInputs = [ pkgconfig ]; 22 buildInputs = [ libftdi1 libusb1 hidapi ];