From 5337648a1cb34f55adc84d0d43558552159e2ef3 Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Tue, 28 Mar 2023 13:02:26 +1100 Subject: [PATCH 1/2] openocd: use packaged libjaylink and jimtcl instead of bundled copies --- pkgs/development/embedded/openocd/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/embedded/openocd/default.nix b/pkgs/development/embedded/openocd/default.nix index 31e1a1cc3b28..204d5794a304 100644 --- a/pkgs/development/embedded/openocd/default.nix +++ b/pkgs/development/embedded/openocd/default.nix @@ -3,6 +3,8 @@ , fetchurl , pkg-config , hidapi +, jimtcl +, libjaylink , libusb1 , libgpiod @@ -22,11 +24,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ hidapi libftdi1 libusb1 ] + buildInputs = [ hidapi jimtcl libftdi1 libjaylink libusb1 ] ++ lib.optional stdenv.isLinux libgpiod; configureFlags = [ "--disable-werror" + "--disable-internal-jimtcl" + "--disable-internal-libjaylink" "--enable-jtag_vpi" "--enable-buspirate" "--enable-remote-bitbang" From 11977034838420a3247f0164bbea8d57d6c97f57 Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Wed, 10 May 2023 17:59:24 +1000 Subject: [PATCH 2/2] libjaylink: enable on darwin also --- pkgs/development/libraries/libjaylink/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libjaylink/default.nix b/pkgs/development/libraries/libjaylink/default.nix index 84ce6e9f2599..5d461940dcea 100644 --- a/pkgs/development/libraries/libjaylink/default.nix +++ b/pkgs/development/libraries/libjaylink/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "libjaylink is a shared library written in C to access SEGGER J-Link and compatible devices."; license = licenses.gpl2Plus; maintainers = with maintainers; [ felixsinger ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }