From 001a84f22adb50971c5d3898012eb92a5c90d503 Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Thu, 31 May 2018 21:33:48 +0000
Subject: [PATCH] etherape: 0.9.13 -> 0.9.17 (#41332)

fixes startup
---
 .../networking/sniffers/etherape/default.nix  | 20 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix
index f01a36cc65f..9c27139c66d 100644
--- a/pkgs/applications/networking/sniffers/etherape/default.nix
+++ b/pkgs/applications/networking/sniffers/etherape/default.nix
@@ -1,24 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, libtool, gtk2, libpcap, libglade, libgnome, libgnomeui
-, gnomedocutils, scrollkeeper, libxslt }:
+{ stdenv, fetchurl, pkgconfig, libtool, gtk2, libpcap, libglade,
+libgnomecanvas, popt, itstool }:
 
 stdenv.mkDerivation rec {
-  name = "etherape-0.9.13";
+  name = "etherape-0.9.17";
   src = fetchurl {
     url = "mirror://sourceforge/etherape/${name}.tar.gz";
-    sha256 = "1xq93k1slyak8mgwrw5kymq0xn0kl8chvfcvaablgki4p0l2lg9a";
+    sha256 = "1n66dw9nsl7zz0qfkb74ncgch3lzms2ssw8dq2bzbk3q1ilad3p6";
   };
 
-  configureFlags = [ "--disable-scrollkeeper" ];
-
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ itstool pkgconfig ];
   buildInputs = [
-    libtool gtk2 libpcap libglade libgnome libgnomeui gnomedocutils
-    scrollkeeper libxslt
+    libtool gtk2 libpcap libglade libgnomecanvas popt
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://etherape.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2Plus;
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ symphorien ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9d7ec7c5d4..d7c718fe878 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15647,7 +15647,7 @@ with pkgs;
   eterm = callPackage ../applications/misc/eterm { };
 
   etherape = callPackage ../applications/networking/sniffers/etherape {
-    inherit (gnome2) gnomedocutils libgnome libglade libgnomeui scrollkeeper;
+    inherit (gnome2) libgnomecanvas libglade;
   };
 
   evilvte = callPackage ../applications/misc/evilvte {