Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at devShellTools-shell 45 lines 1.2 kB view raw
1diff -Naur cron-old/externs.h cron-new/externs.h 2--- cron-old/externs.h 2024-08-23 09:04:25.525752797 -0300 3+++ cron-new/externs.h 2024-08-23 10:12:05.304311078 -0300 4@@ -121,3 +121,14 @@ 5 #ifndef WCOREDUMP 6 # define WCOREDUMP(st) (((st) & 0200) != 0) 7 #endif 8+ 9+/* Nixpkgs-specific patch begin */ 10+ 11+/* 12+ Implicit saved UIDs do not work here due to way NixOS uses setuid wrappers 13+ See https://github.com/NixOS/nixpkgs/issues/16518 14+ */ 15+ 16+#undef HAVE_SAVED_UIDS 17+ 18+/* Nixpkgs-specific patch end */ 19diff -Naur cron-old/pathnames.h cron-new/pathnames.h 20--- cron-old/pathnames.h 2024-08-23 09:04:25.524752791 -0300 21+++ cron-new/pathnames.h 2024-08-23 10:11:33.186749198 -0300 22@@ -105,4 +105,23 @@ 23 # define _PATH_DEVNULL "/dev/null" 24 #endif 25 26+/* Nixpkgs-specific patch begin */ 27+ 28+/* 29+ We want to ignore the $glibc/include/paths.h definition of sendmail path. 30+ Further, set a usable default PATH 31+ See https://github.com/NixOS/nixpkgs/issues/16518 32+ */ 33+ 34+#undef _PATH_SENDMAIL 35+#define _PATH_SENDMAIL "@sendmailPath@" 36+ 37+#undef _PATH_VI 38+#define _PATH_VI "@viPath@" 39+ 40+#undef _PATH_DEFPATH 41+#define _PATH_DEFPATH "@defPath@" 42+ 43+/* Nixpkgs-specific patch end */ 44+ 45 #endif /* _PATHNAMES_H_ */