diff options
author | Shawn8901 <shawn8901@googlemail.com> | 2023-01-24 17:29:20 +0100 |
---|---|---|
committer | Shawn8901 <shawn8901@googlemail.com> | 2023-01-24 17:29:20 +0100 |
commit | 0a1dd3ced1d7a0d7d611c9f64e02fa9cd3ba3c6d (patch) | |
tree | a55d636b68c5d8266e8b3de05a1bcbbf925e21c3 /pkgs/applications/networking/sniffers | |
parent | c0aeb3305473e3a0df97785f562ea8707630e999 (diff) |
treewide: remove global with lib; in pkgs/{misc,networking}
Diffstat (limited to 'pkgs/applications/networking/sniffers')
-rw-r--r-- | pkgs/applications/networking/sniffers/wireshark/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index fbb8842393f52..452263f0742f8 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -8,8 +8,6 @@ assert withQt -> qt5 != null; -with lib; - let version = "4.0.2"; variant = if withQt then "qt" else "cli"; @@ -39,17 +37,17 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config python3 perl ] - ++ optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ]; + ++ lib.optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ gettext pcre2 libpcap lua5 libssh nghttp2 openssl libgcrypt libgpg-error gnutls geoip c-ares glib zlib - ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) - ++ optionals stdenv.isLinux [ libcap libnl ] - ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] - ++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); + ] ++ lib.optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) + ++ lib.optionals stdenv.isLinux [ libcap libnl ] + ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] + ++ lib.optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); strictDeps = true; @@ -72,7 +70,7 @@ in stdenv.mkDerivation { install_name_tool -change "$dylib" "$out/lib/$dylib" "$f" done done - '' else optionalString withQt '' + '' else lib.optionalString withQt '' pwd install -Dm644 -t $out/share/applications ../resources/freedesktop/org.wireshark.Wireshark.desktop |