summary refs log tree commit diff
path: root/pkgs/desktops/enlightenment
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/desktops/enlightenment')
-rw-r--r--pkgs/desktops/enlightenment/0003-setuid-missing-path.patch25
-rw-r--r--pkgs/desktops/enlightenment/enlightenment.nix1
2 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/desktops/enlightenment/0003-setuid-missing-path.patch b/pkgs/desktops/enlightenment/0003-setuid-missing-path.patch
new file mode 100644
index 00000000000..5c32ed9b0d6
--- /dev/null
+++ b/pkgs/desktops/enlightenment/0003-setuid-missing-path.patch
@@ -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
+
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index cbec2006022..2d402b32989 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -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 = ''