diff options
author | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
commit | 5185bc177309c62e53dad1ad346d1220f0e77bd4 (patch) | |
tree | 52f5878b394abf2ef326765d46880ccbabd84903 /pkgs/tools/system/cron | |
parent | 07615735077db344539eb9131823600593f0eddf (diff) | |
parent | f402c6321aa3c6e56f5e1f1e36c4ad459c881309 (diff) |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/system/cron')
-rw-r--r-- | pkgs/tools/system/cron/default.nix | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index 26f088fd54a2c..3d03f19cb6f85 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -16,9 +16,19 @@ stdenv.mkDerivation { makeFlags="DESTROOT=$out" # We want to ignore the $glibc/include/paths.h definition of - # sendmail path - echo "#undef _PATH_SENDMAIL" >> pathnames.h - echo '#define _PATH_SENDMAIL "${sendmailPath}"' >> pathnames.h + # sendmail path. + # Also set a usable default PATH (#16518). + cat >> pathnames.h <<__EOT__ + #undef _PATH_SENDMAIL + #define _PATH_SENDMAIL "${sendmailPath}" + + #undef _PATH_DEFPATH + #define _PATH_DEFPATH "/var/setuid-wrappers:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/run/current-system/sw/bin:/run/current-system/sw/sbin:/usr/bin:/bin" + __EOT__ + + # Implicit saved uids do not work here due to way NixOS uses setuid wrappers + # (#16518). + echo "#undef HAVE_SAVED_UIDS" >> externs.h ''; preInstall = "mkdir -p $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8"; |