From ca81640aaf73ac4aa6250e1ff7532e8a9111479e Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 19 Nov 2023 23:33:46 -0300 Subject: [PATCH] openocd-rp2040: use libgpiod_1 instead of duplicated expressions Signed-off-by: Otavio Salvador --- pkgs/development/embedded/openocd-rp2040/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/embedded/openocd-rp2040/default.nix b/pkgs/development/embedded/openocd-rp2040/default.nix index a7e2bb65953c..688d83ac27e8 100644 --- a/pkgs/development/embedded/openocd-rp2040/default.nix +++ b/pkgs/development/embedded/openocd-rp2040/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchgit -, fetchurl , pkg-config , hidapi , libftdi1 @@ -12,7 +11,7 @@ , automake , texinfo , git -, libgpiod +, libgpiod_1 }: stdenv.mkDerivation { @@ -42,13 +41,7 @@ stdenv.mkDerivation { ] ++ # 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; configurePhase = '' SKIP_SUBMODULE=1 ./bootstrap