treewide: stdenv.lib -> lib
This commit is contained in:
@@ -8,14 +8,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0w63vg2q6if3wvy2md66in8b6cdw9q40hny5xy6yrxky58l4kmg7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ itstool pkgconfig (stdenv.lib.getBin libxml2) ];
|
||||
nativeBuildInputs = [ itstool pkgconfig (lib.getBin libxml2) ];
|
||||
buildInputs = [
|
||||
libtool gtk3 libpcap goocanvas2 popt
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://etherape.sourceforge.net/";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = with platforms; linux;
|
||||
maintainers = with maintainers; [ symphorien ];
|
||||
};
|
||||
|
||||
@@ -22,15 +22,15 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
libpcap pcre libmicrohttpd libnl zlib sqlite protobuf protobufc
|
||||
libusb1 libcap binutils elfutils
|
||||
] ++ stdenv.lib.optionals withNetworkManager [ networkmanager glib ]
|
||||
++ stdenv.lib.optional withSensors lm_sensors
|
||||
++ stdenv.lib.optional withPython (python3.withPackages(ps: [ ps.setuptools ps.protobuf
|
||||
] ++ lib.optionals withNetworkManager [ networkmanager glib ]
|
||||
++ lib.optional withSensors lm_sensors
|
||||
++ lib.optional withPython (python3.withPackages(ps: [ ps.setuptools ps.protobuf
|
||||
ps.numpy ps.pyserial ]));
|
||||
|
||||
configureFlags = []
|
||||
++ stdenv.lib.optional (!withNetworkManager) "--disable-libnm"
|
||||
++ stdenv.lib.optional (!withPython) "--disable-python-tools"
|
||||
++ stdenv.lib.optional (!withSensors) "--disable-lmsensors";
|
||||
++ lib.optional (!withNetworkManager) "--disable-libnm"
|
||||
++ lib.optional (!withPython) "--disable-python-tools"
|
||||
++ lib.optional (!withSensors) "--disable-lmsensors";
|
||||
|
||||
postConfigure = ''
|
||||
sed -e 's/-o $(INSTUSR)//' \
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
assert withQt -> qt5 != null;
|
||||
|
||||
with stdenv.lib;
|
||||
with lib;
|
||||
|
||||
let
|
||||
version = "3.4.2";
|
||||
@@ -47,7 +47,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]
|
||||
# https://code.wireshark.org/review/#/c/23728/
|
||||
++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
|
||||
++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
|
||||
name = "fix-timeout.patch";
|
||||
url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=8b5b843fcbc3e03e0fc45f3caf8cf5fc477e8613;hp=94af9724d140fd132896b650d10c4d060788e4f0";
|
||||
sha256 = "1g2dm7lwsnanwp68b9xr9swspx7hfj4v3z44sz3yrfmynygk8zlv";
|
||||
|
||||
Reference in New Issue
Block a user