nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-26 10:14:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "wireshark-gtk: Fix build"

Browse Source 
This reverts commit 089d86946e

Revert "wireshark-cli: Fix build"

This reverts commit ab769321af
This commit is contained in:
adisbladis
2018-01-19 09:35:53 +08:00
parent 4c54e34505
commit 0e2e25daeb
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@@ -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 ''

12
pkgs/applications/networking/sniffers/wireshark/no-qt4.patch
View File

@@ -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()