wireshark: 2.4.7 -> 2.6.1

This commit is contained in:
Michael Raskin 2018-06-19 21:14:28 +02:00
parent d2c633f55d
commit 5fce881f60
2 changed files with 9 additions and 2 deletions

View file

@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null;
with stdenv.lib;
let
version = "2.4.7";
version = "2.6.1";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
in stdenv.mkDerivation {
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
sha256 = "0i2ggkkx7fphsk7kv9kygsf5pcaf4vgnqgi8mj1rrf2gfdl3rjsy";
sha256 = "126dvd6myjbxjr69dy9vzzdda2lmjy1wwwc6gcs5djb46jy5nvmb";
};
cmakeFlags = [
@ -52,6 +52,10 @@ in stdenv.mkDerivation {
})
++ stdenv.lib.optional stdenv.isDarwin ./cmake.patch;
preBuild = ''
export LD_LIBRARY_PATH="$PWD/run"
'';
postInstall = if stdenv.isDarwin then ''
${optionalString withQt ''
mkdir -p $out/Applications
@ -72,6 +76,8 @@ in stdenv.mkDerivation {
''}
${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 \

View file

@ -15973,6 +15973,7 @@ with pkgs;
wireshark = callPackage ../applications/networking/sniffers/wireshark {
withQt = true;
qt5 = qt59;
withGtk = false;
inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
};