uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,66 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, cairo
, giflib
, glib
, gtk2-x11
, libjpeg
, libpcap
, libpng
, libwebsockets
, pkg-config
, libuv
, openssl
}:
stdenv.mkDerivation rec {
pname = "driftnet";
version = "1.3.0";
src = fetchFromGitHub {
owner = "deiv";
repo = "driftnet";
rev = "v${version}";
sha256 = "0kd22aqb25kf54jjv3ml8wy8xm7lmbf0xz1wfp31m08cbzsbizib";
};
# 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 ];
buildInputs = [
cairo
giflib
glib
gtk2-x11
libjpeg
libpcap
libpng
libwebsockets
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";
maintainers = with maintainers; [ offline ];
platforms = platforms.linux ++ platforms.darwin;
license = licenses.gpl2Plus;
};
}

View file

@ -0,0 +1,12 @@
diff --git a/src/http_display/httpd.c b/src/http_display/httpd.c
index f4709ef..7921d23 100644
--- a/src/http_display/httpd.c
+++ b/src/http_display/httpd.c
@@ -191,7 +191,6 @@ static void * http_server_dispatch(void *arg)
LWSMPRO_FILE, /* mount type is a directory in a filesystem */
1, /* strlen("/"), ie length of the mountpoint */
NULL,
- { NULL, NULL } // sentinel
};
memset(&info, 0, sizeof info);