diff options
| author | Dan Callaghan <dan.callaghan@morsemicro.com> | 2023-03-28 13:02:26 +1100 |
|---|---|---|
| committer | Dan Callaghan <dan.callaghan@morsemicro.com> | 2023-05-09 13:48:22 +1000 |
| commit | 5337648a1cb34f55adc84d0d43558552159e2ef3 (patch) | |
| tree | e3636ad27fcc9d845d4c5c3096aaa288be593800 /pkgs/development/embedded | |
| parent | e138708d302b925c55391908dcfdd7bfacbdcbb9 (diff) | |
| download | nixlib-5337648a1cb34f55adc84d0d43558552159e2ef3.tar nixlib-5337648a1cb34f55adc84d0d43558552159e2ef3.tar.gz nixlib-5337648a1cb34f55adc84d0d43558552159e2ef3.tar.bz2 nixlib-5337648a1cb34f55adc84d0d43558552159e2ef3.tar.lz nixlib-5337648a1cb34f55adc84d0d43558552159e2ef3.tar.xz nixlib-5337648a1cb34f55adc84d0d43558552159e2ef3.tar.zst nixlib-5337648a1cb34f55adc84d0d43558552159e2ef3.zip | |
openocd: use packaged libjaylink and jimtcl instead of bundled copies
Diffstat (limited to 'pkgs/development/embedded')
| -rw-r--r-- | pkgs/development/embedded/openocd/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
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" |