wireshark-qt: make wireshark-qt build and run again

+4 -5
+4 -5
pkgs/applications/networking/sniffers/wireshark/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares 2 2 , gnutls, libgcrypt, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib 3 - , withGtk ? false, gtk ? null 3 + , zlib 4 + , withGtk ? false, gtk ? null, pango ? null, cairo ? null, gdk_pixbuf ? null 4 5 , withQt ? false, qt4 ? null 5 6 }: 6 7 ··· 24 25 25 26 buildInputs = [ 26 27 bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls 27 - geoip libnl c-ares python libcap glib 28 + geoip libnl c-ares python libcap glib zlib 28 29 ] ++ optional withQt qt4 29 - ++ optional withGtk gtk; 30 + ++ (optionals withGtk [gtk pango cairo gdk_pixbuf]); 30 31 31 32 patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; 32 33 ··· 52 53 mkdir -p "$out"/share/icons/ 53 54 cp "$desktopItem/share/applications/"* "$out/share/applications/" 54 55 cp image/wsicon.svg "$out"/share/icons/wireshark.svg 55 - '' + optionalString withQt '' 56 - mv "$out/bin/wireshark-qt" "$out/bin/wireshark" 57 56 ''; 58 57 59 58 enableParallelBuilding = true;