pkgs/applications: stdenv.lib -> lib

This commit is contained in:
Ben Siraphob
2021-01-15 14:24:03 +07:00
parent 2e34288f0d
commit 108bdac3d9
427 changed files with 1160 additions and 1154 deletions
@@ -1,4 +1,4 @@
{stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}:
{ lib, stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}:
stdenv.mkDerivation rec {
name = "daq-2.2.2";
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Data AcQuisition library (DAQ), for packet I/O";
homepage = "https://www.snort.org";
maintainers = with stdenv.lib.maintainers; [ aycanirican ];
license = stdenv.lib.licenses.gpl2;
platforms = with stdenv.lib.platforms; linux;
maintainers = with lib.maintainers; [ aycanirican ];
license = lib.licenses.gpl2;
platforms = with lib.platforms; linux;
};
}
@@ -1,4 +1,4 @@
{stdenv, pkgconfig, luajit, openssl, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper
{lib, stdenv, pkgconfig, luajit, openssl, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper
, libtirpc
}:
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Network intrusion prevention and detection system (IDS/IPS)";
homepage = "https://www.snort.org";
maintainers = with stdenv.lib.maintainers; [ aycanirican ];
license = stdenv.lib.licenses.gpl2;
platforms = with stdenv.lib.platforms; linux;
maintainers = with lib.maintainers; [ aycanirican ];
license = lib.licenses.gpl2;
platforms = with lib.platforms; linux;
};
}
@@ -30,12 +30,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake flex bison file ];
buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig ]
++ stdenv.lib.optionals stdenv.isDarwin [ gettext ];
++ lib.optionals stdenv.isDarwin [ gettext ];
#see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files.
inherit preConfigure;
patches = stdenv.lib.optionals stdenv.cc.isClang [
patches = lib.optionals stdenv.cc.isClang [
# Fix pybind c++17 build with Clang. See: https://github.com/pybind/pybind11/issues/1604
(fetchpatch {
url = "https://github.com/pybind/pybind11/commit/759221f5c56939f59d8f342a41f8e2d2cacbc8cf.patch";