diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2020-01-02 06:15:51 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2020-01-02 09:16:36 +0100 |
| commit | ff882242ea70502696b551c7c9bfb933a250c60f (patch) | |
| tree | 1851f0a9794d8c870095c015f2f5ec4900211ec3 /pkgs/development/tools/misc | |
| parent | 63f2f1df49b1ad2db586b8e50c1a670d915e8229 (diff) | |
| download | nixpkgs-ff882242ea70502696b551c7c9bfb933a250c60f.tar nixpkgs-ff882242ea70502696b551c7c9bfb933a250c60f.tar.gz nixpkgs-ff882242ea70502696b551c7c9bfb933a250c60f.tar.bz2 nixpkgs-ff882242ea70502696b551c7c9bfb933a250c60f.tar.lz nixpkgs-ff882242ea70502696b551c7c9bfb933a250c60f.tar.xz nixpkgs-ff882242ea70502696b551c7c9bfb933a250c60f.tar.zst nixpkgs-ff882242ea70502696b551c7c9bfb933a250c60f.zip | |
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.
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/openocd/default.nix | 11 |
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 ]; |