diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/misc/openocd/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/misc/openocd/default.nix | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/nixpkgs/pkgs/development/tools/misc/openocd/default.nix b/nixpkgs/pkgs/development/tools/misc/openocd/default.nix index 0d6bcd959ebd..47212e9967d0 100644 --- a/nixpkgs/pkgs/development/tools/misc/openocd/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/openocd/default.nix @@ -1,24 +1,17 @@ -{ stdenv, lib, fetchurl, fetchpatch, libftdi1, libusb1, pkgconfig, hidapi }: +{ stdenv, lib, fetchgit, libftdi1, libusb1, pkgconfig, hidapi, autoreconfHook }: stdenv.mkDerivation rec { pname = "openocd"; - version = "0.10.0"; + version = "2020-09-02"; - src = fetchurl { - url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2"; - sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk"; + src = fetchgit { + url = "https://git.code.sf.net/p/openocd/code"; + rev = "d46f28c2ea2611f5fbbc679a5eed253d3dcd2fe3"; + sha256 = "1256qqhn3pxmijfk1x0y5b5kc5ar88ivykkvx0h1m7pdwqfs6zm9"; + fetchSubmodules = true; }; - 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 ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ libftdi1 libusb1 hidapi ]; configureFlags = [ @@ -34,14 +27,9 @@ stdenv.mkDerivation rec { "--enable-remote-bitbang" ]; - NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ - "-Wno-implicit-fallthrough" - "-Wno-format-truncation" - "-Wno-format-overflow" - "-Wno-error=tautological-compare" - "-Wno-error=array-bounds" + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=cpp" - ]); + ]; postInstall = lib.optionalString stdenv.isLinux '' mkdir -p "$out/etc/udev/rules.d" @@ -64,7 +52,7 @@ stdenv.mkDerivation rec { "remote target" for source-level debugging of embedded systems using the GNU GDB program. ''; - homepage = "http://openocd.sourceforge.net/"; + homepage = "https://openocd.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; |