public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openocd: unstable-2020-09-02 -> unstable-2020-11-11

Browse Source 
fix build failure with hidapi 0.10.0
This commit is contained in:
Pavol Rusnak 2020-11-13 22:44:07 +01:00 committed by Bjørn Forsman
parent 6502a6748c
commit 5e76b77ff6
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/tools/misc/openocd/default.nix
View File

@ -1,18 +1,27 @@
{ stdenv, lib, fetchgit, libftdi1, libusb1, pkgconfig, hidapi, autoreconfHook }: { stdenv
, lib
, fetchgit
, autoreconfHook
, pkg-config
, hidapi
, libftdi1
, libusb1
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openocd"; pname = "openocd";
version = "2020-09-02"; version = "unstable-2020-11-11";
src = fetchgit { src = fetchgit {
url = "https://git.code.sf.net/p/openocd/code"; url = "https://git.code.sf.net/p/openocd/code";
rev = "d46f28c2ea2611f5fbbc679a5eed253d3dcd2fe3"; rev = "06c7a53f1fff20bcc4be9e63f83ae98664777f34";
sha256 = "1256qqhn3pxmijfk1x0y5b5kc5ar88ivykkvx0h1m7pdwqfs6zm9"; sha256 = "0g0w7g94r88ylfpwswnhh8czlf5iqvd991ssn4gfcfd725lpdb01";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libftdi1 libusb1 hidapi ];
buildInputs = [ hidapi libftdi1 libusb1 ];
configureFlags = [ configureFlags = [
"--enable-jtag_vpi" "--enable-jtag_vpi"
@ -29,6 +38,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
"-Wno-error=cpp" "-Wno-error=cpp"
"-Wno-error=strict-prototypes" # fixes build failure with hidapi 0.10.0
]; ];
postInstall = lib.optionalString stdenv.isLinux '' postInstall = lib.optionalString stdenv.isLinux ''