nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-26 02:05:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

wireshark: 4.0.3 -> 4.0.4

Browse Source 
(cherry picked from commit ddac6e045f)
This commit is contained in:
QuantMint
2023-03-04 17:56:24 +01:00
committed by Robert Scott
parent 25eabcf8aa
commit 96bb6bc121
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@@ -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
@@ -39,7 +40,7 @@ assert withQt -> qt5 != null;
with lib;
let
version = "4.0.3";
version = "4.0.4";
variant = if withQt then "qt" else "cli";
in
stdenv.mkDerivation {
@@ -47,9 +48,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 = [
@@ -66,8 +69,8 @@ stdenv.mkDerivation {
# Avoid referencing -dev paths because of debug assertions.
NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config python3 perl ]
++ optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ];
nativeBuildInputs = [ asciidoctor bison cmake ninja flex makeWrapper pkg-config python3 perl ]
++ lib.optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ];
depsBuildBuild = [ buildPackages.stdenv.cc ];