From 20414d1a402e36c14e1dd4498e48e2e6153acecd Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 19 Nov 2023 23:33:01 -0300 Subject: [PATCH] openocd: use libgpiod_1 instead of duplicated expressions Signed-off-by: Otavio Salvador --- pkgs/development/embedded/openocd/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/embedded/openocd/default.nix b/pkgs/development/embedded/openocd/default.nix index 954f043a2ade..39e9edc67722 100644 --- a/pkgs/development/embedded/openocd/default.nix +++ b/pkgs/development/embedded/openocd/default.nix @@ -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"