From 56ee5bca693b8e845ca9008edc12f06165d7af75 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:43 +0000 Subject: [PATCH] wireshark: move defaults to package file --- pkgs/applications/networking/sniffers/wireshark/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 99e44269898..db093310ca1 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -2,7 +2,7 @@ , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python, libcap, glib , libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper , withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null -, withQt ? false, qt5 ? null +, withQt ? true, qt5 ? null , ApplicationServices, SystemConfiguration, gmp }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1f0749075a..d2cb636f91d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17107,9 +17107,7 @@ in welle-io = libsForQt5.callPackage ../applications/misc/welle-io { }; wireshark = callPackage ../applications/networking/sniffers/wireshark { - withQt = true; qt5 = qt59; - withGtk = false; inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; }; wireshark-qt = wireshark;