diff options
author | Reno Reckling <exi@wthack.de> | 2015-12-31 13:56:50 +0100 |
---|---|---|
committer | Reno Reckling <exi@wthack.de> | 2015-12-31 13:56:50 +0100 |
commit | 28fd7afd0215b3d0f32ffee5f320e1a839f8f7d4 (patch) | |
tree | e4d260801d0aa6c4bebf843d9507987baad90388 /pkgs/applications/networking/sniffers/wireshark | |
parent | 468f698f609e123bb0ffae67181d07ac99eb2204 (diff) | |
download | nixlib-28fd7afd0215b3d0f32ffee5f320e1a839f8f7d4.tar nixlib-28fd7afd0215b3d0f32ffee5f320e1a839f8f7d4.tar.gz nixlib-28fd7afd0215b3d0f32ffee5f320e1a839f8f7d4.tar.bz2 nixlib-28fd7afd0215b3d0f32ffee5f320e1a839f8f7d4.tar.lz nixlib-28fd7afd0215b3d0f32ffee5f320e1a839f8f7d4.tar.xz nixlib-28fd7afd0215b3d0f32ffee5f320e1a839f8f7d4.tar.zst nixlib-28fd7afd0215b3d0f32ffee5f320e1a839f8f7d4.zip |
wireshark-qt: make wireshark-qt build and run again
Diffstat (limited to 'pkgs/applications/networking/sniffers/wireshark')
-rw-r--r-- | pkgs/applications/networking/sniffers/wireshark/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index b49c309f5ba6..58be839d737a 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares , gnutls, libgcrypt, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib -, withGtk ? false, gtk ? null +, zlib +, withGtk ? false, gtk ? null, pango ? null, cairo ? null, gdk_pixbuf ? null , withQt ? false, qt4 ? null }: @@ -24,9 +25,9 @@ stdenv.mkDerivation { buildInputs = [ bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls - geoip libnl c-ares python libcap glib + geoip libnl c-ares python libcap glib zlib ] ++ optional withQt qt4 - ++ optional withGtk gtk; + ++ (optionals withGtk [gtk pango cairo gdk_pixbuf]); patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; @@ -52,8 +53,6 @@ stdenv.mkDerivation { mkdir -p "$out"/share/icons/ cp "$desktopItem/share/applications/"* "$out/share/applications/" cp image/wsicon.svg "$out"/share/icons/wireshark.svg - '' + optionalString withQt '' - mv "$out/bin/wireshark-qt" "$out/bin/wireshark" ''; enableParallelBuilding = true; |