me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Maxim Cournoyer 2023-03-22 09:41:31 -04:00
parent 19af6d9434
commit 4f8a13b9fb
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/networking.scm
View File

@ -1773,7 +1773,8 @@ of the same name.")
;; libraries, which would otherwise cause the validate-runpath phase to ;; libraries, which would otherwise cause the validate-runpath phase to
;; fail. ;; fail.
#:configure-flags #~(list (string-append "-DCMAKE_MODULE_LINKER_FLAGS=" #:configure-flags #~(list (string-append "-DCMAKE_MODULE_LINKER_FLAGS="
"-Wl,-rpath=" #$output "/lib")) "-Wl,-rpath=" #$output "/lib")
"-DUSE_qt6=ON")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'check (replace 'check
@ -1799,14 +1800,15 @@ of the same name.")
libssh libssh
libxml2 libxml2
lz4 lz4
lua-5.2 ;Lua 5.3 unsupported lua
mit-krb5 mit-krb5
`(,nghttp2 "lib") `(,nghttp2 "lib")
minizip minizip
pcre2 pcre2
qtbase-5 qt5compat
qtmultimedia-5 qtbase
qtsvg-5 qtmultimedia
qtsvg
sbc sbc
snappy snappy
zlib zlib
@ -1819,7 +1821,7 @@ of the same name.")
perl perl
pkg-config pkg-config
python-wrapper python-wrapper
qttools-5)) qttools))
(synopsis "Network traffic analyzer") (synopsis "Network traffic analyzer")
(description "Wireshark is a network protocol analyzer, or @dfn{packet (description "Wireshark is a network protocol analyzer, or @dfn{packet
sniffer}, that lets you capture and interactively browse the contents of sniffer}, that lets you capture and interactively browse the contents of