Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6502a6748cdc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5e76b77ff60a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 14, 2020

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

    fix build failure with hidapi 0.10.0
    @prusnak @bjornfor
    prusnak authored and bjornfor committed Nov 14, 2020
    Copy the full SHA
    5e76b77 View commit details
Showing with 16 additions and 6 deletions.
  1. +16 −6 pkgs/development/tools/misc/openocd/default.nix
22 changes: 16 additions & 6 deletions pkgs/development/tools/misc/openocd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
{ stdenv, lib, fetchgit, libftdi1, libusb1, pkgconfig, hidapi, autoreconfHook }:
{ stdenv
, lib
, fetchgit
, autoreconfHook
, pkg-config
, hidapi
, libftdi1
, libusb1
}:

stdenv.mkDerivation rec {
pname = "openocd";
version = "2020-09-02";
version = "unstable-2020-11-11";

src = fetchgit {
url = "https://git.code.sf.net/p/openocd/code";
rev = "d46f28c2ea2611f5fbbc679a5eed253d3dcd2fe3";
sha256 = "1256qqhn3pxmijfk1x0y5b5kc5ar88ivykkvx0h1m7pdwqfs6zm9";
rev = "06c7a53f1fff20bcc4be9e63f83ae98664777f34";
sha256 = "0g0w7g94r88ylfpwswnhh8czlf5iqvd991ssn4gfcfd725lpdb01";
fetchSubmodules = true;
};

nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ libftdi1 libusb1 hidapi ];
nativeBuildInputs = [ autoreconfHook pkg-config ];

buildInputs = [ hidapi libftdi1 libusb1 ];

configureFlags = [
"--enable-jtag_vpi"
@@ -29,6 +38,7 @@ stdenv.mkDerivation rec {

NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
"-Wno-error=cpp"
"-Wno-error=strict-prototypes" # fixes build failure with hidapi 0.10.0
];

postInstall = lib.optionalString stdenv.isLinux ''