wireshark-gtk: Fix build

NixOS · Jan 18, 2018 · 089d869 · 089d869
1 parent 924ceda
commit 089d869
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -23,7 +23,7 @@ in stdenv.mkDerivation {
     sha256 = "0n3g28hrhifnchlz4av0blq4ykm4zaxwwxbzdm9wsba27677b6h4";
   };
 
-  cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE";
+  cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE -DENABLE_QT5=FALSE";
 
   nativeBuildInputs = [
     bison cmake extra-cmake-modules flex
@@ -37,7 +37,8 @@ in stdenv.mkDerivation {
     ++ optionals stdenv.isLinux  [ libcap libnl ]
     ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];
 
-  patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
+  patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]
+    ++ optional withGtk ./no-qt4.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
@@ -0,0 +1,12 @@
+--- 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()