Merge pull request #147592 from ckiee/wireshark-gsettings

wireshark: add wrapGAppsHook fixing open/save GUI
This commit is contained in:
Maximilian Bosch 2021-11-28 09:59:21 +01:00 committed by GitHub
commit ebeeea1c76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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