diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-11-28 09:59:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-28 09:59:21 +0100 |
| commit | ebeeea1c76213e0afa38eccb051538aed2f0eb41 (patch) | |
| tree | e35f91c8b4a6da2cb77da04818e88a4fb09eace4 /pkgs/applications/networking/sniffers | |
| parent | f3e7e37dfb30f3380832c653867368180deaae93 (diff) | |
| parent | c249f14bf8249246eacf342225996903acf5e1ef (diff) | |
Merge pull request #147592 from ckiee/wireshark-gsettings
wireshark: add wrapGAppsHook fixing open/save GUI
Diffstat (limited to 'pkgs/applications/networking/sniffers')
| -rw-r--r-- | pkgs/applications/networking/sniffers/wireshark/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 7c9eda762603c..ebd4e9744b1c1 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpg-error, geoip, openssl, lua5, python3, libcap, glib , libssh, nghttp2, zlib, cmake, makeWrapper -, withQt ? true, qt5 ? null +, withQt ? true, qt5 ? null, wrapGAppsHook ? null , ApplicationServices, SystemConfiguration, gmp }: @@ -33,7 +33,9 @@ in stdenv.mkDerivation { # Avoid referencing -dev paths because of debug assertions. NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; - nativeBuildInputs = [ bison cmake flex makeWrapper pkg-config ] ++ optional withQt qt5.wrapQtAppsHook; + nativeBuildInputs = [ + bison cmake flex makeWrapper pkg-config + ] ++ optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ]; buildInputs = [ gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt |