diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/tools/misc/openocd/default.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/tools/misc/openocd/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/tools/misc/openocd/default.nix | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/openocd/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/openocd/default.nix index 47212e9967d0..5c8e95f7fd4b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/misc/openocd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/misc/openocd/default.nix @@ -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 '' |