Merge pull request #230806 from danc86/openocd-no-bundled

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"

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;
   };
 }