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

wireshark: 2.4.7 -> 2.6.1

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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