Merge pull request #7319 from bjornfor/wireshark-fix

wireshark: change dependency heimdal -> openssl
This commit is contained in:
Peter Simons 2015-04-11 13:33:05 +02:00
commit 57ba9d3b28

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares { stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares
, gnutls, libgcrypt, geoip, heimdal, lua5, makeDesktopItem, python, libcap, glib , gnutls, libgcrypt, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
, withGtk ? false, gtk ? null , withGtk ? false, gtk ? null
, withQt ? false, qt4 ? null , withQt ? false, qt4 ? null
}: }:
@ -23,7 +23,7 @@ stdenv.mkDerivation {
}; };
buildInputs = [ buildInputs = [
bison flex perl pkgconfig libpcap lua5 heimdal 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
] ++ optional withQt qt4 ] ++ optional withQt qt4
++ optional withGtk gtk; ++ optional withGtk gtk;