summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-01-17 11:10:58 +0100
committerPeter Simons <simons@cryp.to>2014-01-17 11:10:58 +0100
commitca73a9257894f5942a4dd0ce41f486dda7120de6 (patch)
treec412cb89a769e0b9b5d957a2efa33955964fd929
parentac2a215c10fd1d9d61c869ca5afe86802e3c1860 (diff)
downloadnixlib-ca73a9257894f5942a4dd0ce41f486dda7120de6.tar
nixlib-ca73a9257894f5942a4dd0ce41f486dda7120de6.tar.gz
nixlib-ca73a9257894f5942a4dd0ce41f486dda7120de6.tar.bz2
nixlib-ca73a9257894f5942a4dd0ce41f486dda7120de6.tar.lz
nixlib-ca73a9257894f5942a4dd0ce41f486dda7120de6.tar.xz
nixlib-ca73a9257894f5942a4dd0ce41f486dda7120de6.tar.zst
nixlib-ca73a9257894f5942a4dd0ce41f486dda7120de6.zip
wireshark: the gtk3 build fails, so use gtk2
Duh, this is much more difficult than I would have thought.
-rw-r--r--pkgs/applications/networking/sniffers/wireshark/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index f8dc16ced8d0..ed2ce4c12c00 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares
-, gnutls, libgcrypt, geoip, heimdal, lua5, gtk3, makeDesktopItem
+, gnutls, libgcrypt, geoip, heimdal, lua5, gtk, makeDesktopItem, python
 }:
 
 let version = "1.11.2"; in
@@ -14,10 +14,10 @@ stdenv.mkDerivation {
 
   buildInputs = [
     bison flex perl pkgconfig libpcap lua5 heimdal libgcrypt gnutls
-    geoip libnl c-ares gtk3
+    geoip libnl c-ares gtk python
   ];
 
-  configureFlags = "--disable-usr-local --disable-silent-rules --with-gtk3 --without-qt --with-ssl";
+  configureFlags = "--disable-usr-local --disable-silent-rules --with-gtk2 --without-gtk3 --without-qt --with-ssl";
 
   desktopItem = makeDesktopItem {
     name = "Wireshark";
@@ -36,6 +36,8 @@ stdenv.mkDerivation {
     cp image/wsicon.svg "$out"/share/icons/wireshark.svg
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://www.wireshark.org/;
     description = "a powerful network protocol analyzer";