From ddac6e045f121a12541d9faf3842a5868b204358 Mon Sep 17 00:00:00 2001
From: QuantMint <quantmint@protonmail.com>
Date: Sat, 4 Mar 2023 17:56:24 +0100
Subject: wireshark: 4.0.3 -> 4.0.4

---
 .../networking/sniffers/wireshark/default.nix          | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'pkgs/applications/networking/sniffers')

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index b12e5ba4fb5c..3ac1d8cd94aa 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , buildPackages
-, fetchurl
+, fetchFromGitLab
 , pkg-config
 , pcre2
 , perl
@@ -24,6 +24,7 @@
 , nghttp2
 , zlib
 , cmake
+, ninja
 , makeWrapper
 , wrapGAppsHook
 , withQt ? true
@@ -37,7 +38,7 @@
 assert withQt -> qt5 != null;
 
 let
-  version = "4.0.3";
+  version = "4.0.4";
   variant = if withQt then "qt" else "cli";
 in
 stdenv.mkDerivation {
@@ -45,9 +46,11 @@ stdenv.mkDerivation {
   inherit version;
   outputs = [ "out" "dev" ];
 
-  src = fetchurl {
-    url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
-    sha256 = "sha256-bFHhW8wK+5NzTmhtv/NU/9FZ9XC9KQS8u61vP+t+lRE=";
+  src = fetchFromGitLab {
+    repo = "wireshark";
+    owner = "wireshark";
+    rev = "v${version}";
+    hash = "sha256-x7McplQVdLczTov+u9eqmT1Ons22KqRsCN65pUuwYGw=";
   };
 
   cmakeFlags = [
@@ -64,7 +67,7 @@ stdenv.mkDerivation {
   # Avoid referencing -dev paths because of debug assertions.
   env.NIX_CFLAGS_COMPILE = toString [ "-DQT_NO_DEBUG" ];
 
-  nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config python3 perl ]
+  nativeBuildInputs = [ asciidoctor bison cmake ninja flex makeWrapper pkg-config python3 perl ]
     ++ lib.optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ];
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -84,7 +87,8 @@ stdenv.mkDerivation {
     c-ares
     glib
     zlib
-  ] ++ lib.optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools qtwayland ])
+  ] ++ lib.optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
+  ++ lib.optionals (withQt && stdenv.isLinux) [ qt5.qtwayland ]
   ++ lib.optionals stdenv.isLinux [ libcap libnl ]
   ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
   ++ lib.optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]);
-- 
cgit 1.4.1