Commit dbaa1259 authored by Philipp Bartsch's avatar Philipp Bartsch
Browse files

vectorscan: 5.4.10.1 -> 5.4.11

The darwin (or libcxxStdenv) builds use C++17, which only seems to work
with boost >= 1.83.

The errors look like this:

include/boost/functional.hpp:454:62: error: no template named 'binary_function' in namespace 'boost::functional::detail'; did you mean '__binary_function'?
    class mem_fun1_ref_t : public boost::functional::detail::binary_function<T&, A, S>
                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~^
include/boost/functional.hpp:46:24: note: '__binary_function' declared here
            using std::binary_function;
parent 23074d5d
Loading
Loading
Loading
Loading
+10 −4
Original line number Diff line number Diff line
@@ -2,32 +2,38 @@
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, ragel
, util-linux
, python3
, boost
, boost184
, sqlite
, pcre
, enableShared ? !stdenv.hostPlatform.isStatic
}:

stdenv.mkDerivation rec {
  pname = "vectorscan";
  version = "5.4.10.1";
  version = "5.4.11";

  src = fetchFromGitHub {
    owner = "VectorCamp";
    repo = "vectorscan";
    rev = "vectorscan/${version}";
    hash = "sha256-x6FefOrUvpN/A4GXTd+3SGZEAQL6pXt83ufxRIY3Q9k=";
    hash = "sha256-wz2oIhau/vjnri3LOyPZSCFAWg694FTLVt7+SZYEsL4=";
  };

  nativeBuildInputs = [
    cmake
    pkg-config
    ragel
    python3
  ] ++ lib.optional stdenv.isLinux util-linux;

  buildInputs = [
    boost
    boost184
    sqlite
    pcre
  ];

  # FAT_RUNTIME bundles optimized implementations for different CPU extensions and uses CPUID to