summary refs log tree commit diff
path: root/pkgs/applications/networking/sniffers
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2017-03-16 00:53:32 +0300
committerNikolay Amiantov <ab@fmap.me>2017-03-16 00:53:42 +0300
commit545e267adfc796bcceeb5c6702075fb2890cabe2 (patch)
tree3774a9028d8ee3b4c0937642b36a6cf12a9a8c6f /pkgs/applications/networking/sniffers
parentef56873e981bf919046c210f8ae44254885409ee (diff)
downloadnixlib-545e267adfc796bcceeb5c6702075fb2890cabe2.tar
nixlib-545e267adfc796bcceeb5c6702075fb2890cabe2.tar.gz
nixlib-545e267adfc796bcceeb5c6702075fb2890cabe2.tar.bz2
nixlib-545e267adfc796bcceeb5c6702075fb2890cabe2.tar.lz
nixlib-545e267adfc796bcceeb5c6702075fb2890cabe2.tar.xz
nixlib-545e267adfc796bcceeb5c6702075fb2890cabe2.tar.zst
nixlib-545e267adfc796bcceeb5c6702075fb2890cabe2.zip
wireshark-gtk: wrap properly
Diffstat (limited to 'pkgs/applications/networking/sniffers')
-rw-r--r--pkgs/applications/networking/sniffers/wireshark/default.nix14
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index fd709aa76603..375a948c1f20 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
 , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
 , libssh, zlib, cmake, extra-cmake-modules
-, withGtk ? false, gtk3 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null
+, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null
 , withQt ? false, qt5 ? null
 , ApplicationServices, SystemConfiguration, gmp
 }:
@@ -23,11 +23,15 @@ in stdenv.mkDerivation {
     sha256 = "049r5962yrajhhz9r4dsnx403dab50d6091y2mw298ymxqszp9s2";
   };
 
+  nativeBuildInputs = [
+    bison cmake extra-cmake-modules flex
+  ] ++ optional withGtk wrapGAppsHook;
+
   buildInputs = [
-    bison cmake extra-cmake-modules flex gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls
-    geoip c-ares python glib zlib
-  ] ++ (optionals withQt  (with qt5; [ qtbase qtmultimedia qtsvg qttools ]))
-    ++ (optionals withGtk [ gtk3 pango cairo gdk_pixbuf ])
+    gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt
+    libgpgerror gnutls geoip c-ares python glib zlib
+  ] ++ optionals withQt  (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
+    ++ optionals withGtk [ gtk3 librsvg gsettings_desktop_schemas ]
     ++ optionals stdenv.isLinux  [ libcap libnl ]
     ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];