diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/networking/driftnet/default.nix')
-rw-r--r-- | nixpkgs/pkgs/tools/networking/driftnet/default.nix | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/nixpkgs/pkgs/tools/networking/driftnet/default.nix b/nixpkgs/pkgs/tools/networking/driftnet/default.nix index 1f489b7fbc71..ccf6da31be28 100644 --- a/nixpkgs/pkgs/tools/networking/driftnet/default.nix +++ b/nixpkgs/pkgs/tools/networking/driftnet/default.nix @@ -1,47 +1,38 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch +{ lib +, stdenv , autoreconfHook , cairo +, fetchFromGitHub , giflib , glib , gtk2-x11 , libjpeg , libpcap , libpng -, libwebsockets -, pkg-config , libuv +, libwebsockets +, libwebp , openssl +, pkg-config }: stdenv.mkDerivation rec { pname = "driftnet"; - version = "1.3.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "deiv"; repo = "driftnet"; - rev = "v${version}"; - sha256 = "0kd22aqb25kf54jjv3ml8wy8xm7lmbf0xz1wfp31m08cbzsbizib"; + rev = "refs/tags/v${version}"; + hash = "sha256-lMn60vtOMPs1Tr+SnAOUZDrNIO7gEXdHpizjXiEkkoM="; }; - # https://github.com/deiv/driftnet/pull/33 - # remove on version bump from 1.3.0 - patches = [ - (fetchpatch { - name = "fix-darwin-build"; - url = "https://github.com/deiv/driftnet/pull/33/commits/bef5f3509ab5710161e9e21ea960a997eada534f.patch"; - sha256 = "1b7p9fkgp7dxv965l7q7y632s80h3nnrkaqnak2h0hakwv0i4pvm"; - }) - # https://github.com/deiv/driftnet/issues/37 - ./libwebsockets-4.3.0.patch - ]; - enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; buildInputs = [ cairo @@ -51,16 +42,18 @@ stdenv.mkDerivation rec { libjpeg libpcap libpng + libuv libwebsockets + libwebp openssl - libuv ]; meta = with lib; { description = "Watches network traffic, and picks out and displays JPEG and GIF images for display"; homepage = "https://github.com/deiv/driftnet"; + changelog = "https://github.com/deiv/driftnet/releases/tag/v${version}"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ offline ]; platforms = platforms.linux ++ platforms.darwin; - license = licenses.gpl2Plus; }; } |