ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-23 05:37:27 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #147680 from ckiee/revert-147592-wireshark-gsettings

Browse Source 
Revert "wireshark: add wrapGAppsHook fixing open/save GUI"
This commit is contained in:
Maximilian Bosch 2021-11-28 11:05:43 +01:00 committed by GitHub
commit 9dd8cb8ce2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/sniffers/wireshark/default.nix
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, wrapGAppsHook ? null
, withQt ? true, qt5 ? null
, ApplicationServices, SystemConfiguration, gmp
}:
@ -33,9 +33,7 @@ in stdenv.mkDerivation {
# Avoid referencing -dev paths because of debug assertions.
NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
nativeBuildInputs = [
bison cmake flex makeWrapper pkg-config
] ++ optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ];
nativeBuildInputs = [ bison cmake flex makeWrapper pkg-config ] ++ optional withQt qt5.wrapQtAppsHook;
buildInputs = [
gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt