mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Florian Klink <flokli@flokli.de>
|
|
Date: Sun, 8 Mar 2020 01:05:54 +0100
|
|
Subject: [PATCH] path-util.h: add placeholder for DEFAULT_PATH_NORMAL
|
|
|
|
This will be the $PATH used to lookup ExecStart= etc. options, which
|
|
systemd itself uses extensively.
|
|
---
|
|
src/basic/path-util.h | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/basic/path-util.h b/src/basic/path-util.h
|
|
index fcb3aa9399..b9e69cbf91 100644
|
|
--- a/src/basic/path-util.h
|
|
+++ b/src/basic/path-util.h
|
|
@@ -17,10 +17,10 @@
|
|
#define PATH_MERGED_BIN(x) x "bin"
|
|
#define PATH_MERGED_BIN_NULSTR(x) x "bin\0"
|
|
|
|
-#define DEFAULT_PATH_WITH_SBIN PATH_SPLIT_BIN("/usr/local/") ":" PATH_SPLIT_BIN("/usr/")
|
|
-#define DEFAULT_PATH_WITHOUT_SBIN PATH_MERGED_BIN("/usr/local/") ":" PATH_MERGED_BIN("/usr/")
|
|
+#define DEFAULT_PATH_WITH_SBIN "@defaultPathNormal@"
|
|
+#define DEFAULT_PATH_WITHOUT_SBIN DEFAULT_PATH_WITH_SBIN
|
|
|
|
-#define DEFAULT_PATH_COMPAT PATH_SPLIT_BIN("/usr/local/") ":" PATH_SPLIT_BIN("/usr/") ":" PATH_SPLIT_BIN("/")
|
|
+#define DEFAULT_PATH_COMPAT DEFAULT_PATH_WITH_SBIN
|
|
|
|
const char* default_PATH(void);
|
|
|