From 1979284362af4d35bb602e2175b5986df778729d Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 6 Mar 2021 21:17:28 +0100 Subject: ocamlPackages.ctypes: 0.17.1 -> 0.18.0 https://github.com/ocamllabs/ocaml-ctypes/blob/0.18.0/CHANGES.md#ctypes-0180 * ocamlPackages.async_ssl: fix compatibility with ctypes 0.18.0 by using ctypes.foreign instead of ctypes.foreign.threaded since the distinction between threaded and unthreaded has been removed in this release. * libbap: link with -thread so linking ctypes.foreign doesn't fail https://github.com/BinaryAnalysisPlatform/bap-bindings/issues/18 * ocaml-ng.ocamlPackages_4_07.sodium: patch lib_gen/_tags to also add the `package(bigarray)` directive since `ctypes.stubs` no longer propgates that, leading to module not found error. * ocaml-ng.ocamlPackages_4_{04,05,06,07}.async_ssl: mark as broken: due to the bigarray-compat dependency, we need dune 2 for ctypes which breaks compilation of the legacy async_ssl 0.11 version since we can't upgrade to dune 2 for it since that version doesn't support the legacy jbuild files. --- pkgs/development/libraries/libbap/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs/development/libraries/libbap') diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index b8e71c2dfd3f3..c15de88f6a765 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation { sha256 = "0m4spva3z6fgbwlg4zq53l5p227dic893q2qq65pvzxyf7k7nmil"; }; + postPatch = '' + substituteInPlace Makefile.in \ + --replace "-linkpkg" "-thread -linkpkg" + ''; + nativeBuildInputs = [ autoreconfHook which ]; buildInputs = [ ocaml bap findlib ctypes ]; -- cgit 1.4.1