jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wireshark: 2.6.6 -> 3.0.1

Browse Source 
See https://www.wireshark.org/docs/relnotes/wireshark-3.0.0.html.
Drops gtk build.
This commit is contained in:
Matthieu Coudron 2019-03-03 17:15:03 +09:00
parent 2fdca0eb58
commit 5e19cec491
2 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -1,19 +1,17 @@
{ stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python, libcap, glib
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
, libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper
, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null
, withQt ? true, qt5 ? null
, ApplicationServices, SystemConfiguration, gmp
}:
assert withGtk -> !withQt && gtk3 != null;
assert withQt -> !withGtk && qt5 != null;
assert withQt -> qt5 != null;
with stdenv.lib;
let
version = "2.6.6";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
version = "3.0.1";
variant = if withQt then "qt" else "cli";
in stdenv.mkDerivation {
name = "wireshark-${variant}-${version}";
@ -21,11 +19,10 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
sha256 = "0qz8a1ays63712pq1v7nnw7c57zlqkcifq7himfv5nsv0zm36ya8";
sha256 = "13605bpnnbqsdr8ybqnscbz9g422zmyymn4q5aci28vc1wylr1l6";
};
cmakeFlags = [
"-DBUILD_wireshark_gtk=${if withGtk then "ON" else "OFF"}"
"-DBUILD_wireshark=${if withQt then "ON" else "OFF"}"
"-DENABLE_QT5=${if withQt then "ON" else "OFF"}"
"-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}"
@ -33,13 +30,12 @@ in stdenv.mkDerivation {
nativeBuildInputs = [
bison cmake extra-cmake-modules flex pkgconfig
] ++ optional withGtk wrapGAppsHook;
];
buildInputs = [
gettext pcre perl libpcap lua5 libssh openssl libgcrypt
libgpgerror gnutls geoip c-ares python glib zlib makeWrapper
libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper
] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
++ optionals withGtk [ gtk3 librsvg gsettings-desktop-schemas ]
++ optionals stdenv.isLinux [ libcap libnl ]
++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]);
@ -60,8 +56,7 @@ in stdenv.mkDerivation {
export LD_LIBRARY_PATH="$PWD/run"
'';
postInstall = if stdenv.isDarwin then ''
${optionalString withQt ''
postInstall = if (stdenv.isDarwin && withQt) then ''
mkdir -p $out/Applications
mv $out/bin/Wireshark.app $out/Applications/Wireshark.app
@ -73,16 +68,10 @@ in stdenv.mkDerivation {
wrapProgram $out/Applications/Wireshark.app/Contents/MacOS/Wireshark \
--set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}
''}
'' else optionalString (withQt || withGtk) ''
${optionalString withGtk ''
install -Dm644 -t $out/share/applications ../wireshark-gtk.desktop
''}
${optionalString withQt ''
'' else optionalString withQt ''
install -Dm644 -t $out/share/applications ../wireshark.desktop
wrapProgram $out/bin/wireshark \
--set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}
''}
substituteInPlace $out/share/applications/*.desktop \
--replace "Exec=wireshark" "Exec=$out/bin/wireshark"
@ -98,6 +87,11 @@ in stdenv.mkDerivation {
cp ../epan/dfilter/*.h $dev/include/epan/dfilter/
cp ../wsutil/*.h $dev/include/wsutil/
cp ../wiretap/*.h $dev/include/wiretap
'' + ''
# to remove "cycle detected in the references"
mkdir -p $dev/lib/wireshark
mv $out/lib/wireshark/cmake $dev/lib/wireshark
'';
enableParallelBuilding = true;

5
pkgs/top-level/all-packages.nix
View File

@ -17467,14 +17467,13 @@ in
welle-io = libsForQt5.callPackage ../applications/radio/welle-io { };
wireshark = callPackage ../applications/networking/sniffers/wireshark {
qt5 = qt59;
inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
};
wireshark-qt = wireshark;
# The GTK UI is deprecated by upstream. You probably want the QT version.
wireshark-gtk = wireshark.override { withGtk = true; withQt = false; };
wireshark-cli = wireshark.override { withGtk = false; withQt = false; };
wireshark-gtk = throw "Not supported anymore. Use wireshark-qt or wireshark-cli instead.";
wireshark-cli = wireshark.override { withQt = false; };
fbida = callPackage ../applications/graphics/fbida { };