diff options
| author | lewo <lewo@abesis.fr> | 2018-06-16 22:26:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-16 22:26:37 +0200 |
| commit | c2cfb6c57a7620bce94f883a04675d68be64ed7f (patch) | |
| tree | 6a26bc1adeab7d0bb29a661d8ebbe40e07b3d946 /pkgs | |
| parent | 7413c2cabb8b1e1e0294e933d74f8a9dcaaea59b (diff) | |
| parent | cb907b5d5124cf12b97ef0846b29f6930db37815 (diff) | |
| download | nixpkgs-c2cfb6c57a7620bce94f883a04675d68be64ed7f.tar nixpkgs-c2cfb6c57a7620bce94f883a04675d68be64ed7f.tar.gz nixpkgs-c2cfb6c57a7620bce94f883a04675d68be64ed7f.tar.bz2 nixpkgs-c2cfb6c57a7620bce94f883a04675d68be64ed7f.tar.lz nixpkgs-c2cfb6c57a7620bce94f883a04675d68be64ed7f.tar.xz nixpkgs-c2cfb6c57a7620bce94f883a04675d68be64ed7f.tar.zst nixpkgs-c2cfb6c57a7620bce94f883a04675d68be64ed7f.zip | |
Merge pull request #42068 from symphorien/etherape-0.9.18
etherape: 0.9.17 -> 0.9.18
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/sniffers/etherape/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index 9c27139c66d..81c48cff4a0 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, libtool, gtk2, libpcap, libglade, -libgnomecanvas, popt, itstool }: +{ stdenv, fetchurl, pkgconfig, libtool, gtk3, libpcap, goocanvas2, +popt, itstool, libxml2 }: stdenv.mkDerivation rec { - name = "etherape-0.9.17"; + name = "etherape-0.9.18"; src = fetchurl { url = "mirror://sourceforge/etherape/${name}.tar.gz"; - sha256 = "1n66dw9nsl7zz0qfkb74ncgch3lzms2ssw8dq2bzbk3q1ilad3p6"; + sha256 = "0y9cfc5iv5zy82j165i9agf45n1ixka064ykdvpdhb07sr3lzhmv"; }; - nativeBuildInputs = [ itstool pkgconfig ]; + nativeBuildInputs = [ itstool pkgconfig (stdenv.lib.getBin libxml2) ]; buildInputs = [ - libtool gtk2 libpcap libglade libgnomecanvas popt + libtool gtk3 libpcap goocanvas2 popt ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c27d905d082..fc3c4db2690 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15757,9 +15757,7 @@ with pkgs; eterm = callPackage ../applications/misc/eterm { }; - etherape = callPackage ../applications/networking/sniffers/etherape { - inherit (gnome2) libgnomecanvas libglade; - }; + etherape = callPackage ../applications/networking/sniffers/etherape { }; evilvte = callPackage ../applications/misc/evilvte { configH = config.evilvte.config or ""; |