Merge pull request #91980 from bagnaram/fix/enlightenment-setuid-patch

enlightenment: setuid missing path
This commit is contained in:
José Romildo Malaquias 2020-07-06 16:11:23 -03:00 committed by GitHub
commit fcb06300f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions

View File

@ -0,0 +1,25 @@
From b7ef2a0d3f31db55a12b2b8c2e1c60ba62b971c8 Mon Sep 17 00:00:00 2001
From: Matt Bagnara <mbagnara@fastmail.com>
Date: Wed, 1 Jul 2020 15:30:40 -0500
Subject: [PATCH] add nixos path
---
src/bin/e_util_suid.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_util_suid.h b/src/bin/e_util_suid.h
index b01ff792b..88c2a0f17 100644
--- a/src/bin/e_util_suid.h
+++ b/src/bin/e_util_suid.h
@@ -246,7 +246,7 @@ e_setuid_setup(uid_t *caller_uid, gid_t *caller_gid, char **caller_user, char **
# endif
#endif
// pass 3 - set path and ifs to minimal defaults
- putenv("PATH=/bin:/usr/bin:/sbin:/usr/sbin");
+ putenv("PATH=/bin:/usr/bin:/sbin:/usr/sbin:/run/current-system/sw/bin");
putenv("IFS= \t\n");
return 0;
}
--
2.27.0

View File

@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
# wrapped in the enlightenment service module, and the wrapped
# executables should be used instead.
./0001-wrapped-setuid-executables.patch
./0003-setuid-missing-path.patch
];
postPatch = ''