From 0e2e25daeb1180e92b9eacb65fa0c33efdeeb5de Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 19 Jan 2018 09:35:53 +0800
Subject: [PATCH] Revert "wireshark-gtk: Fix build"

This reverts commit 089d86946e85acdaa18e91faa03569e268f243dd

Revert "wireshark-cli: Fix build"

This reverts commit ab769321af08c84aeca6f1640d811b96bea2fcf4
---
 .../networking/sniffers/wireshark/default.nix        |  6 ++----
 .../networking/sniffers/wireshark/no-qt4.patch       | 12 ------------
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/applications/networking/sniffers/wireshark/no-qt4.patch

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index e310d915e972..5c7aaa7f0541 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -23,8 +23,7 @@ in stdenv.mkDerivation {
     sha256 = "0n3g28hrhifnchlz4av0blq4ykm4zaxwwxbzdm9wsba27677b6h4";
   };
 
-  cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE"
-    ++ optional (!withQt) "-DENABLE_QT5=FALSE";
+  cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE";
 
   nativeBuildInputs = [
     bison cmake extra-cmake-modules flex
@@ -38,8 +37,7 @@ in stdenv.mkDerivation {
     ++ optionals stdenv.isLinux  [ libcap libnl ]
     ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];
 
-  patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]
-    ++ optional (!withQt) ./no-qt4.patch;
+  patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
 
   postInstall = optionalString (withQt || withGtk) ''
     ${optionalString withGtk ''
diff --git a/pkgs/applications/networking/sniffers/wireshark/no-qt4.patch b/pkgs/applications/networking/sniffers/wireshark/no-qt4.patch
deleted file mode 100644
index 24d141a765e6..000000000000
--- a/pkgs/applications/networking/sniffers/wireshark/no-qt4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt	2018-01-18 21:51:05.721284031 +0800
-+++ b/CMakeLists.txt	2018-01-18 21:51:59.976275611 +0800
-@@ -811,10 +811,6 @@
- 			set(Qt5WinExtras_OPTIONS REQUIRED)
- 		endif()
- 		set(QT_VERSION 5)
--	else()
--		set(PACKAGELIST ${PACKAGELIST} Qt4)
--		set(Qt4_OPTIONS 4.8 REQUIRED QtCore QtGui)
--		set(QT_VERSION 4)
- 	endif()
- endif()