diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/hyperscan/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/hyperscan/default.nix | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix index 0e45b277a325..b04d5966a5a9 100644 --- a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix +++ b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix @@ -9,25 +9,22 @@ # which is fixed 8.41 version requirement (nixpkgs have 8.42+, and # I not see any reason (for now) to backport 8.41. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hyperscan"; - version = "5.4.0"; + version = "5.4.2"; src = fetchFromGitHub { owner = "intel"; - repo = pname; - sha256 = "sha256-AJAjaXVnGqIlMk+gb6lpTLUdZr8nxn2XSW4fj6j/cmk="; - rev = "v${version}"; + repo = "hyperscan"; + hash = "sha256-tzmVc6kJPzkFQLUM1MttQRLpgs0uckbV6rCxEZwk1yk="; + rev = "v${finalAttrs.version}"; }; outputs = [ "out" "dev" ]; buildInputs = [ boost ]; nativeBuildInputs = [ - cmake ragel python3 - # Consider simply using busybox for these - # Need at least: rev, sed, cut, nm - util-linux + cmake ragel python3 util-linux ]; cmakeFlags = [ @@ -37,14 +34,6 @@ stdenv.mkDerivation rec { ++ lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON" ++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON"; - patches = [ - (fetchpatch { - # part of https://github.com/intel/hyperscan/pull/336 - url = "https://github.com/intel/hyperscan/commit/e2c4010b1fc1272cab816ba543940b3586e68a0c.patch"; - sha256 = "sha256-doVNwROL6MTcgOW8jBwGTnxe0zvxjawiob/g6AvXLak="; - }) - ]; - postPatch = '' sed -i '/examples/d' CMakeLists.txt substituteInPlace libhs.pc.in \ @@ -69,7 +58,7 @@ stdenv.mkDerivation rec { homepage = "https://www.hyperscan.io/"; maintainers = with maintainers; [ avnik ]; - platforms = [ "x86_64-linux" ]; # can't find nm on darwin ; might build on aarch64 but untested + platforms = [ "x86_64-linux" ]; license = licenses.bsd3; }; -} +}) |