Skip to content

Instantly share code, notes, and snippets.

@andir
Created November 1, 2018 21:26
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save andir/dc061ee069f10d70799e4c41e447a1b3 to your computer and use it in GitHub Desktop.
Save andir/dc061ee069f10d70799e4c41e447a1b3 to your computer and use it in GitHub Desktop.
systemd v239 stablish patch
diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index 8277c6b91..eded6950e 100644
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -23,10 +23,13 @@
# define PATH_SBIN_BIN_NULSTR(x) PATH_NORMAL_SBIN_BIN_NULSTR(x)
#endif
-#define DEFAULT_PATH_NORMAL PATH_SBIN_BIN("/usr/local/") ":" PATH_SBIN_BIN("/usr/")
+#define DEFAULT_NIXOS_PATH PATH_SPLIT_SBIN_BIN("/run/current-system/sw/")
+#define DEFAULT_NIXOS_PATH_NULSTR PATH_SPLIT_SBIN_BIN_NULSTR("/run/current-system/sw/")
+
+#define DEFAULT_PATH_NORMAL DEFAULT_NIXOS_PATH ":" PATH_SBIN_BIN("/usr/local/") ":" PATH_SBIN_BIN("/usr/")
#define DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/usr/local/") PATH_SBIN_BIN_NULSTR("/usr/")
-#define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":" PATH_SBIN_BIN("/")
-#define DEFAULT_PATH_SPLIT_USR_NULSTR DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/")
+#define DEFAULT_PATH_SPLIT_USR DEFAULT_NIXOS_PATH ":" DEFAULT_PATH_NORMAL ":" PATH_SBIN_BIN("/")
+#define DEFAULT_PATH_SPLIT_USR_NULSTR DEFAULT_NIXOS_PATH_NULSTR DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/")
#define DEFAULT_PATH_COMPAT PATH_SPLIT_SBIN_BIN("/usr/local/") ":" PATH_SPLIT_SBIN_BIN("/usr/") ":" PATH_SPLIT_SBIN_BIN("/")
#if HAVE_SPLIT_USR
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment