mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-08 05:54:24 +00:00
40eff710af
Reverts NixOS/nixpkgs#269620 -eab0837b68caused a mass-rebuild on master - self-merge on a critical package without review and not waiting for the active owner team Below are the reverts of the commits from that PR Revert "systemd: migrate to by-name" This reverts commit33d2a40d67. Revert "systemd: add meta.longDescription" This reverts commit7c588d141d. Revert "systemd: cosmetic rewording of code" This reverts commitd91b8d9fcb. Revert "systemd: cosmetic rewording of comments" This reverts commitbc563998c0. Revert "systemd: remove some redundancy on mesonFlags" This reverts commiteab0837b68. Revert "systemd: use lib.meson* functions" This reverts commit1129756b1a.
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Rammhold <andreas@rammhold.de>
|
|
Date: Thu, 9 May 2019 11:15:22 +0200
|
|
Subject: [PATCH] add rootprefix to lookup dir paths
|
|
|
|
systemd does not longer use the UDEVLIBEXEC directory as root for
|
|
discovery default udev rules. By adding `$out/lib` to the lookup paths
|
|
we should again be able to discover the udev rules amongst other default
|
|
files that I might have missed.
|
|
---
|
|
src/basic/constants.h | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/basic/constants.h b/src/basic/constants.h
|
|
index 3f96786da9..6e8fb40c08 100644
|
|
--- a/src/basic/constants.h
|
|
+++ b/src/basic/constants.h
|
|
@@ -74,13 +74,15 @@
|
|
"/run/" n "\0" \
|
|
"/usr/local/lib/" n "\0" \
|
|
"/usr/lib/" n "\0" \
|
|
- _CONF_PATHS_SPLIT_USR_NULSTR(n)
|
|
+ _CONF_PATHS_SPLIT_USR_NULSTR(n) \
|
|
+ ROOTPREFIX "/lib/" n "\0"
|
|
|
|
#define CONF_PATHS_USR(n) \
|
|
"/etc/" n, \
|
|
"/run/" n, \
|
|
"/usr/local/lib/" n, \
|
|
- "/usr/lib/" n
|
|
+ "/usr/lib/" n, \
|
|
+ ROOTPREFIX "/lib/" n
|
|
|
|
#define CONF_PATHS(n) \
|
|
CONF_PATHS_USR(n) \
|