Commit 20414d1a authored by Otavio Salvador's avatar Otavio Salvador
Browse files

openocd: use libgpiod_1 instead of duplicated expressions 



Signed-off-by: default avatarOtavio Salvador <otavio@ossystems.com.br>
parent 12c0a5ca

pkgs/development/embedded/openocd/default.nix

+2 −8
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
, jimtcl

, libjaylink

, libusb1

, libgpiod

, libgpiod_1



, enableFtdi ? true, libftdi1
@@ -27,13 +27,7 @@ stdenv.mkDerivation rec { 
  buildInputs = [ hidapi jimtcl libftdi1 libjaylink libusb1 ]

    ++

    # tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/

    lib.optional stdenv.isLinux (libgpiod.overrideAttrs (old: rec {

      version = "1.6.4";

      src = fetchurl {

        url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";

        sha256 = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo=";

      };

    }));

    lib.optional stdenv.isLinux libgpiod_1;



  configureFlags = [

    "--disable-werror"