Merge pull request #42068 from symphorien/etherape-0.9.18

etherape: 0.9.17 -> 0.9.18
This commit is contained in:
lewo 2018-06-16 22:26:37 +02:00 committed by GitHub
commit c2cfb6c57a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions

View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, pkgconfig, libtool, gtk2, libpcap, libglade, { stdenv, fetchurl, pkgconfig, libtool, gtk3, libpcap, goocanvas2,
libgnomecanvas, popt, itstool }: popt, itstool, libxml2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "etherape-0.9.17"; name = "etherape-0.9.18";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/etherape/${name}.tar.gz"; url = "mirror://sourceforge/etherape/${name}.tar.gz";
sha256 = "1n66dw9nsl7zz0qfkb74ncgch3lzms2ssw8dq2bzbk3q1ilad3p6"; sha256 = "0y9cfc5iv5zy82j165i9agf45n1ixka064ykdvpdhb07sr3lzhmv";
}; };
nativeBuildInputs = [ itstool pkgconfig ]; nativeBuildInputs = [ itstool pkgconfig (stdenv.lib.getBin libxml2) ];
buildInputs = [ buildInputs = [
libtool gtk2 libpcap libglade libgnomecanvas popt libtool gtk3 libpcap goocanvas2 popt
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -15757,9 +15757,7 @@ with pkgs;
eterm = callPackage ../applications/misc/eterm { }; eterm = callPackage ../applications/misc/eterm { };
etherape = callPackage ../applications/networking/sniffers/etherape { etherape = callPackage ../applications/networking/sniffers/etherape { };
inherit (gnome2) libgnomecanvas libglade;
};
evilvte = callPackage ../applications/misc/evilvte { evilvte = callPackage ../applications/misc/evilvte {
configH = config.evilvte.config or ""; configH = config.evilvte.config or "";