mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 20:33:21 +00:00
748378a3ec
Removed patches: - 0007-Fix-hwdb-paths.patch The directory we want seems to already be included in the list. Is there a reason why we want to restrict it further? - 0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch This patch has little to do with how the meson.build file looks now. The new patch 0017 is the successor to this one. - 0015-pkg-config-derive-prefix-from-prefix.patch This is fixed upstream. We don't need this anymore.
36 lines
1.3 KiB
Diff
36 lines
1.3 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 6bb5f3c281..678d13737d 100644
|
|
--- a/src/basic/constants.h
|
|
+++ b/src/basic/constants.h
|
|
@@ -65,13 +65,15 @@
|
|
"/etc/" n "\0" \
|
|
"/run/" n "\0" \
|
|
"/usr/local/lib/" n "\0" \
|
|
- "/usr/lib/" n "\0"
|
|
+ "/usr/lib/" n "\0" \
|
|
+ PREFIX "/lib/" n "\0"
|
|
|
|
#define CONF_PATHS_USR(n) \
|
|
"/etc/" n, \
|
|
"/run/" n, \
|
|
"/usr/local/lib/" n, \
|
|
- "/usr/lib/" n
|
|
+ "/usr/lib/" n, \
|
|
+ PREFIX "/lib/" n
|
|
|
|
#define CONF_PATHS(n) \
|
|
CONF_PATHS_USR(n)
|