diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-05-28 20:45:37 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-05-28 20:45:37 -0400 |
| commit | 82b695b834f88c5561de40e68f3fe7aa24d3b796 (patch) | |
| tree | 41743fff1013584ee4a50852a94cff01c3cc3d1c /gnu/packages/networking.scm | |
| parent | fe365a3d0e4df7445bf16d3bb422a0bc6bb68ceb (diff) | |
| parent | ee3c8fbee21299ce105bafca7dc63bfb096cd7c5 (diff) | |
| download | guix-82b695b834f88c5561de40e68f3fe7aa24d3b796.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/networking.scm')
| -rw-r--r-- | gnu/packages/networking.scm | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 251816d13f..bddd4bc857 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2018 Adam Van Ymeren <adam@vany.ca> ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> ;;; Copyright © 2018 Tonton <tonton@riseup.net> +;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -590,7 +591,21 @@ of the same name.") (assoc-ref %build-inputs "portaudio")) (string-append "--with-sbc=" (assoc-ref %build-inputs "sbc")) (string-append "--with-snappy=" (assoc-ref %build-inputs "snappy")) - (string-append "--with-zlib=" (assoc-ref %build-inputs "zlib"))))) + (string-append "--with-zlib=" (assoc-ref %build-inputs "zlib"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; Fix build against Qt 5.11. + (substitute* "ui/qt/packet_format_group_box.cpp" + (("#include <QStyle>") "#include <QStyle> +#include <QStyleOption>")) + (substitute* "ui/qt/time_shift_dialog.cpp" + (("#include <ui/time_shift.h>") "#include <ui/time_shift.h> +#include <QStyleOption>")) + (substitute* "ui/qt/wireless_frame.cpp" + (("#include <QProcess>") "#include <QProcess> +#include <QAbstractItemView>"))))))) (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 |