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
30
pkgs/misc/screensavers/vlock/default.nix
Normal file
30
pkgs/misc/screensavers/vlock/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib, stdenv, fetchurl, pam }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vlock";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/v/vlock/vlock_${version}.orig.tar.gz";
|
||||
sha256 = "1b9gv7hmlb8swda5bn40lp1yki8b8wv29vdnhcjqfl6ir98551za";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
sed -i -e '/INSTALL/ {
|
||||
s/-[og] [^ ]*//g; s/4711/755/
|
||||
}' Makefile modules/Makefile
|
||||
'';
|
||||
|
||||
patches = [ ./eintr.patch ];
|
||||
|
||||
configureFlags = [ "VLOCK_GROUP=root" "ROOT_GROUP=root" ];
|
||||
|
||||
buildInputs = [ pam ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Virtual console locking program";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
34
pkgs/misc/screensavers/vlock/eintr.patch
Normal file
34
pkgs/misc/screensavers/vlock/eintr.patch
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
In systemd I have seen this error, using it as a service:
|
||||
|
||||
vlock-start[14567]: vlock-new: could not activate new terminal: Interrupted system call
|
||||
|
||||
I think this should fix that.
|
||||
|
||||
Also on github: https://github.com/viric/vlock/commit/781a26087f83c7247601b6f82f784cca9266694e
|
||||
|
||||
diff --git a/modules/new.c b/modules/new.c
|
||||
index e9b15fb..7aed640 100644
|
||||
--- a/modules/new.c
|
||||
+++ b/modules/new.c
|
||||
@@ -103,9 +103,19 @@ static char *get_console_name(int n)
|
||||
* file descriptor. */
|
||||
static int activate_console(int consfd, int vtno)
|
||||
{
|
||||
- int c = ioctl(consfd, VT_ACTIVATE, vtno);
|
||||
+ int c;
|
||||
+ do {
|
||||
+ c = ioctl(consfd, VT_ACTIVATE, vtno);
|
||||
+ } while(c != 0 && errno == EINTR);
|
||||
|
||||
- return c < 0 ? c : ioctl(consfd, VT_WAITACTIVE, vtno);
|
||||
+ if (c < 0)
|
||||
+ return c;
|
||||
+
|
||||
+ do {
|
||||
+ c = ioctl(consfd, VT_WAITACTIVE, vtno);
|
||||
+ } while(c != 0 && errno == EINTR);
|
||||
+
|
||||
+ return c;
|
||||
}
|
||||
|
||||
struct new_console_context {
|
||||
Loading…
Add table
Add a link
Reference in a new issue