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,52 @@
{ lib
, stdenv
, fetchurl
, perlPackages
, pkg-config
, gtk2
, scrollkeeper
, libglade
, libXmu
, libX11
, libXext
, gettext
, lame
, libXfixes
, libXdamage
}:
stdenv.mkDerivation rec {
pname = "xvidcap";
version = "1.1.7";
src = fetchurl {
url = "mirror://sourceforge/xvidcap/xvidcap-${version}.tar.gz";
sha256 = "0p8rhpyhxgy37crf1xk1046z4p663jg7ww776jw92pld3s024ihm";
};
patches = [ ./xlib.patch ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
gtk2
scrollkeeper
libglade
libXmu
gettext
lame
libXdamage
libXfixes
libXext
libX11
] ++ (with perlPackages; [ perl XMLParser ]);
# !!! don't know why this is necessary
NIX_LDFLAGS = "-lXext -lX11 -lz -lgcc_s";
meta = with lib; {
description = "Screencast video catpuring tool";
homepage = "http://xvidcap.sourceforge.net/";
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,15 @@
diff --git a/src/app_data.c b/src/app_data.c
index 5a44363..482b115 100644
--- a/src/app_data.c
+++ b/src/app_data.c
@@ -52,9 +52,9 @@
#include <pthread.h>
#include <signal.h>
+#include <X11/Xlib.h>
#ifdef HAVE_LIBXFIXES
#include <X11/X.h>
-#include <X11/Xlib.h>
#include <X11/Xlibint.h>
#include <X11/Xproto.h>
#include <X11/Xutil.h>