[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/05: gnu: wireshark: Update dependencies, use Qt 6.
From: |
guix-commits |
Subject: |
05/05: gnu: wireshark: Update dependencies, use Qt 6. |
Date: |
Wed, 22 Mar 2023 10:12:14 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 4f8a13b9fbfd0efcb94ee8da46b09c6dbe84ac4b
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Mar 22 09:41:31 2023 -0400
gnu: wireshark: Update dependencies, use Qt 6.
* gnu/packages/networking.scm (wireshark)
[arguments] <#:configure-flags>: Add -DUSE_qt6=ON.
[inputs]: Replace lua-5.2 with lua,
qtbase-5 with qtbase, qtmultimedia-5 with qtmultimedia, qtsvg-5 with qtsvg.
Add qt5compat.
[native-inputs]: replace qttools-5 with qttools.
---
gnu/packages/networking.scm | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 26451c91a9..ecb1d16615 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1773,7 +1773,8 @@ of the same name.")
;; libraries, which would otherwise cause the validate-runpath phase to
;; fail.
#:configure-flags #~(list (string-append "-DCMAKE_MODULE_LINKER_FLAGS="
- "-Wl,-rpath=" #$output "/lib"))
+ "-Wl,-rpath=" #$output "/lib")
+ "-DUSE_qt6=ON")
#:phases
#~(modify-phases %standard-phases
(replace 'check
@@ -1799,14 +1800,15 @@ of the same name.")
libssh
libxml2
lz4
- lua-5.2 ;Lua 5.3 unsupported
+ lua
mit-krb5
`(,nghttp2 "lib")
minizip
pcre2
- qtbase-5
- qtmultimedia-5
- qtsvg-5
+ qt5compat
+ qtbase
+ qtmultimedia
+ qtsvg
sbc
snappy
zlib
@@ -1819,7 +1821,7 @@ of the same name.")
perl
pkg-config
python-wrapper
- qttools-5))
+ qttools))
(synopsis "Network traffic analyzer")
(description "Wireshark is a network protocol analyzer, or @dfn{packet
sniffer}, that lets you capture and interactively browse the contents of
- branch master updated (2b66b54bae -> 4f8a13b9fb), guix-commits, 2023/03/22
- 03/05: gnu: wireshark: Update to 4.0.4., guix-commits, 2023/03/22
- 01/05: services: Add fstrim-service-type., guix-commits, 2023/03/22
- 02/05: gnu: mame: Update to 0.252., guix-commits, 2023/03/22
- 04/05: gnu: wireshark: Re-instate the validate-runpath phase., guix-commits, 2023/03/22
- 05/05: gnu: wireshark: Update dependencies, use Qt 6.,
guix-commits <=