diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-06-19 21:14:28 +0200 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2018-06-19 21:21:19 +0200 |
| commit | 5fce881f60a475f113270ba5f7d721ae8fb35f34 (patch) | |
| tree | 93077c81f2698875a28ed164c2236ce8c56b5ea3 /pkgs/applications/networking | |
| parent | d2c633f55dc0ebb1186ff8e391ab1b82c3df3433 (diff) | |
| download | nixlib-5fce881f60a475f113270ba5f7d721ae8fb35f34.tar nixlib-5fce881f60a475f113270ba5f7d721ae8fb35f34.tar.gz nixlib-5fce881f60a475f113270ba5f7d721ae8fb35f34.tar.bz2 nixlib-5fce881f60a475f113270ba5f7d721ae8fb35f34.tar.lz nixlib-5fce881f60a475f113270ba5f7d721ae8fb35f34.tar.xz nixlib-5fce881f60a475f113270ba5f7d721ae8fb35f34.tar.zst nixlib-5fce881f60a475f113270ba5f7d721ae8fb35f34.zip | |
wireshark: 2.4.7 -> 2.6.1
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/sniffers/wireshark/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index f3afeced8f65..42038426515e 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -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 \ |