dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Reno Reckling 2015-12-31 13:56:50 +01:00
parent 468f698f60
commit 28fd7afd02
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares { stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares
, gnutls, libgcrypt, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib , 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 , withQt ? false, qt4 ? null
}: }:
@ -24,9 +25,9 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls 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 withQt qt4
++ optional withGtk gtk; ++ (optionals withGtk [gtk pango cairo gdk_pixbuf]);
patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
@ -52,8 +53,6 @@ stdenv.mkDerivation {
mkdir -p "$out"/share/icons/ mkdir -p "$out"/share/icons/
cp "$desktopItem/share/applications/"* "$out/share/applications/" cp "$desktopItem/share/applications/"* "$out/share/applications/"
cp image/wsicon.svg "$out"/share/icons/wireshark.svg cp image/wsicon.svg "$out"/share/icons/wireshark.svg
'' + optionalString withQt ''
mv "$out/bin/wireshark-qt" "$out/bin/wireshark"
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;