summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAndrew Childs <lorne@cons.org.nz>2019-12-28 20:25:49 +0900
committerBjørn Forsman <bjorn.forsman@gmail.com>2019-12-30 17:21:39 +0100
commit2b3975d5d2cb7cf2f9214bd36aa8b783baaf358f (patch)
tree371d9dda809ebc1641d8a2d66e9650466622235f /pkgs
parent4b877fb11b5b1f8267f763ce73d43df38c8dcb15 (diff)
downloadnixpkgs-2b3975d5d2cb7cf2f9214bd36aa8b783baaf358f.tar
nixpkgs-2b3975d5d2cb7cf2f9214bd36aa8b783baaf358f.tar.gz
nixpkgs-2b3975d5d2cb7cf2f9214bd36aa8b783baaf358f.tar.bz2
nixpkgs-2b3975d5d2cb7cf2f9214bd36aa8b783baaf358f.tar.lz
nixpkgs-2b3975d5d2cb7cf2f9214bd36aa8b783baaf358f.tar.xz
nixpkgs-2b3975d5d2cb7cf2f9214bd36aa8b783baaf358f.tar.zst
nixpkgs-2b3975d5d2cb7cf2f9214bd36aa8b783baaf358f.zip
openocd: Fix FTDI channel configuration for SheevaPlug
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/tools/misc/openocd/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index 80203dd0df9..169c1afd55d 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, libftdi1, libusb1, pkgconfig, hidapi }:
+{ stdenv, lib, fetchurl, fetchpatch, libftdi1, libusb1, pkgconfig, hidapi }:
 
 stdenv.mkDerivation rec {
   pname = "openocd";
@@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
     sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk";
   };
 
+  patches = [
+    # Fix FTDI channel configuration for SheevaPlug
+    # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837989
+    (fetchpatch {
+      url = "https://salsa.debian.org/electronics-team/openocd/raw/9a94335daa332a37a51920f87afbad4d36fad2d5/debian/patches/fix-sheeva.patch";
+      sha256 = "01x021fagwvgxdpzk7psap7ryqiya4m4mi4nqr27asbmb3q46g5r";
+    })
+  ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libftdi1 libusb1 hidapi ];