public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
      pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
This commit is contained in:
Tuomas Tynkkynen
2017-03-14 00:49:22 +02:00
parent 8bfa9f528c 46c9eac980
commit aba0b45b86
210 changed files with 5435 additions and 2932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/misc/screensavers/vlock/eintr.patch
View File

@@ -4,11 +4,13 @@ vlock-start[14567]: vlock-new: could not activate new terminal: Interrupted syst
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..1f692fd 100644
index e9b15fb..7aed640 100644
--- a/modules/new.c
+++ b/modules/new.c
@@ -103,7 +103,10 @@ static char *get_console_name(int n)
@@ -103,9 +103,19 @@ static char *get_console_name(int n)
* file descriptor. */
static int activate_console(int consfd, int vtno)
{
@@ -18,5 +20,15 @@ index e9b15fb..1f692fd 100644
+ c = ioctl(consfd, VT_ACTIVATE, vtno);
+ } while(c != 0 && errno == EINTR);
return c < 0 ? c : ioctl(consfd, VT_WAITACTIVE, vtno);
- 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 {