Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'

1 files changed, 7 insertions, 7 deletions

diff --git a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix
index 17246f0aa0a9..f160afb99b7c 100644
--- a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, cmake, ragel, python3
+{ lib, stdenv, fetchFromGitHub, cmake, ragel, python3
 , coreutils, gnused, util-linux
 , boost
 , withStatic ? false # build only shared libs by default, build static+shared if true
 }:
 
-# NOTICE: pkgconfig, pcap and pcre intentionally omitted from build inputs
-#         pcap used only in examples, pkgconfig used only to check for pcre
+# NOTICE: pkg-config, pcap and pcre intentionally omitted from build inputs
+#         pcap used only in examples, pkg-config used only to check for pcre
 #         which is fixed 8.41 version requirement (nixpkgs have 8.42+, and
 #         I not see any reason (for now) to backport 8.41.
 
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
     "-DFAT_RUNTIME=ON"
     "-DBUILD_AVX512=ON"
   ]
-  ++ stdenv.lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON"
-  ++ stdenv.lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON";
+  ++ lib.optional (withStatic) "-DBUILD_STATIC_AND_SHARED=ON"
+  ++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON";
 
   postPatch = ''
     sed -i '/examples/d' CMakeLists.txt
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
       --replace "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "High-performance multiple regex matching library";
     longDescription = ''
       Hyperscan is a high-performance multiple regex matching library.
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
       Hyperscan uses hybrid automata techniques to allow simultaneous
       matching of large numbers (up to tens of thousands) of regular
-      expressions and for the matching of regular expressions across 
+      expressions and for the matching of regular expressions across
       streams of data.
 
       Hyperscan is typically used in a DPI library stack.