nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add an overlay for fixing typespeed

Browse source
This commit is contained in:
Alexander Sosedkin 2020-06-12 21:27:39 +02:00
parent 6012e0a8e6
commit 8e97da49d0
3 changed files with 51 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
overlays/default.nix
View file

@ -2,4 +2,5 @@
[
(import ./htop.nix)
(import ./typespeed.nix)
]

35
overlays/typespeed-no-drop-priv.patch Normal file
View file

@ -0,0 +1,35 @@
diff -ru typespeed-0.6.5/src/typespeed.c typespeed/src/typespeed.c
--- a/src/typespeed.c 2008-08-13 16:36:51.000000000 +0200
+++ b/src/typespeed.c 2020-06-12 20:59:08.682552635 +0200
@@ -322,31 +322,6 @@
if ((hfd = open(HIGHFILE, O_RDWR, 0)) == -1)
xerr(1, "main: open: %s", HIGHFILE);
-#ifndef WIN32
- /* drop privileges */
- mygid = getgid();
-#if defined(HAVE_SETRESGID)
- if (setresgid(mygid, mygid, mygid) == -1) {
- fputs("Cannot drop privilege!\n", stderr);
- exit(1);
- }
-#elif defined(HAVE_RESREGID)
- if (setregid(mygid, mygid) == -1) {
- fputs("Cannot drop privilege!\n", stderr);
- exit(1);
- }
-#else
- if (setegid(mygid) == -1) {
- fputs("Cannot drop privilege!\n", stderr);
- exit(1);
- }
- if (setgid(mygid) == -1) {
- fputs("Cannot drop privilege!\n", stderr);
- exit(1);
- }
-#endif /* HAVE_SETRESGID */
-#endif /* WIN32 */
-
/* check file descriptors for consistency */
if (hfd == STDIN_FILENO || hfd == STDOUT_FILENO ||
hfd == STDERR_FILENO)

15
overlays/typespeed.nix Normal file
View file

@ -0,0 +1,15 @@
# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE.
self: super:
let
nixpkgs = import ./lib/nixpkgs.nix { inherit super; };
in
{
typespeed = nixpkgs.typespeed.overrideAttrs (old: {
patches = nixpkgs.typespeed.patches ++ [
./typespeed-no-drop-priv.patch
];
});
}