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:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,63 @@
|
|||
From 009c426ab37ef7f8d9d8e30f45096225203d694a Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Tue, 11 Aug 2020 11:27:21 +0200
|
||||
Subject: [PATCH] Fix build for glibc-2.32
|
||||
|
||||
The `sys_siglist`-array has been removed. Instead, `strsignal` should be
|
||||
used.
|
||||
---
|
||||
console/fbtools.c | 2 +-
|
||||
console/record.c | 2 +-
|
||||
x11/rootv.c | 4 ++--
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/console/fbtools.c b/console/fbtools.c
|
||||
index 9f876df..07739ff 100644
|
||||
--- a/console/fbtools.c
|
||||
+++ b/console/fbtools.c
|
||||
@@ -520,6 +520,6 @@ fb_catch_exit_signals(void)
|
||||
|
||||
/* cleanup */
|
||||
fb_cleanup();
|
||||
- fprintf(stderr,"Oops: %s\n",sys_siglist[termsig]);
|
||||
+ fprintf(stderr,"Oops: %s\n",strsignal(termsig));
|
||||
exit(42);
|
||||
}
|
||||
diff --git a/console/record.c b/console/record.c
|
||||
index 685221b..90f0c85 100644
|
||||
--- a/console/record.c
|
||||
+++ b/console/record.c
|
||||
@@ -429,7 +429,7 @@ ctrlc(int signal)
|
||||
{
|
||||
if (verbose)
|
||||
fprintf(stderr,"\n%s - exiting\n",
|
||||
- sys_siglist[signal]);
|
||||
+ strsignal(signal));
|
||||
stop = 1;
|
||||
}
|
||||
|
||||
diff --git a/x11/rootv.c b/x11/rootv.c
|
||||
index 60a8406..4bf458b 100644
|
||||
--- a/x11/rootv.c
|
||||
+++ b/x11/rootv.c
|
||||
@@ -133,7 +133,7 @@ catch_sig(int signal)
|
||||
termsig = signal;
|
||||
if (verbose)
|
||||
fprintf(stderr,"received signal %d [%s]\n",
|
||||
- termsig,sys_siglist[termsig]);
|
||||
+ termsig,strsignal(termsig));
|
||||
}
|
||||
|
||||
static void usage(FILE *fp)
|
||||
@@ -422,7 +422,7 @@ main(int argc, char *argv[])
|
||||
}
|
||||
if (verbose && termsig)
|
||||
fprintf(stderr,"exiting on signal %d [%s]\n",
|
||||
- termsig,sys_siglist[termsig]);
|
||||
+ termsig,strsignal(termsig));
|
||||
if (do_mute && have_mute)
|
||||
XvSetPortAttribute(dpy,port,XV_MUTE,1);
|
||||
XvStopVideo(dpy,port,win);
|
||||
--
|
||||
2.25.4
|
||||
|
||||
66
pkgs/applications/video/xawtv/default.nix
Normal file
66
pkgs/applications/video/xawtv/default.nix
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, ncurses
|
||||
, libjpeg
|
||||
, libX11
|
||||
, libXt
|
||||
, alsa-lib
|
||||
, aalib
|
||||
, libXft
|
||||
, xorgproto
|
||||
, libv4l
|
||||
, libFS
|
||||
, libXaw
|
||||
, libXpm
|
||||
, libXext
|
||||
, libSM
|
||||
, libICE
|
||||
, perl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xawtv";
|
||||
version = "3.107";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://linuxtv.org/downloads/xawtv/xawtv-${version}.tar.bz2";
|
||||
sha256 = "055p0wia0xsj073l8mg4ifa6m81dmv6p45qyh99brramq5iylfy5";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-Fix-build-for-glibc-2.32.patch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ncurses
|
||||
libjpeg
|
||||
libX11
|
||||
libXt
|
||||
libXft
|
||||
xorgproto
|
||||
libFS
|
||||
perl
|
||||
alsa-lib
|
||||
aalib
|
||||
libXaw
|
||||
libXpm
|
||||
libXext
|
||||
libSM
|
||||
libICE
|
||||
libv4l
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"SUID_ROOT=" # do not try to setuid
|
||||
"resdir=${placeholder "out"}/share/X11"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "TV application for Linux with apps and tools such as a teletext browser";
|
||||
license = lib.licenses.gpl2;
|
||||
homepage = "https://www.kraxel.org/blog/linux/xawtv/";
|
||||
maintainers = with lib.maintainers; [ domenkozar ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue