From c77e0539e0bbf051281e13f611705e02b9fb7938 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 5 Jan 2018 20:08:20 +0100 Subject: [PATCH 1/2] wireshark-gtk: explicitly disable the Qt build when building Gtk In a recent Cmake(?) or wireshark release the default behaviour did change. A failing build log can be seen at hydra [1]. [1] https://hydra.nixos.org/build/67179559/nixlog/1 --- pkgs/applications/networking/sniffers/wireshark/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 5fe818a506b..7c17fb715a7 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { sha256 = "0bpiby916k3k8bm7q8b1dflva6zs0a4ircskrck0d538dfcrb50q"; }; - cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE"; + cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE -DBUILD_wireshark=OFF"; nativeBuildInputs = [ bison cmake extra-cmake-modules flex pkgconfig From 969d61dd429b7798c12eeed8ca2d9bbd54aa4b08 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 6 Jan 2018 05:45:23 +0100 Subject: [PATCH 2/2] wireshark: en- & disable Gtk/Qt separately This should also fix the wireshark-cli variant --- pkgs/applications/networking/sniffers/wireshark/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 7c17fb715a7..f91c0de9c8d 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -23,7 +23,10 @@ in stdenv.mkDerivation { sha256 = "0bpiby916k3k8bm7q8b1dflva6zs0a4ircskrck0d538dfcrb50q"; }; - cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE -DBUILD_wireshark=OFF"; + cmakeFlags = [ + "-DBUILD_wireshark_gtk=${if withGtk then "ON" else "OFF"}" + "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}" + ]; nativeBuildInputs = [ bison cmake extra-cmake-modules flex pkgconfig