mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-15 02:03:01 +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.
25 lines
918 B
Diff
25 lines
918 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Nikolay Amiantov <ab@fmap.me>
|
|
Date: Thu, 7 Jul 2016 02:47:13 +0300
|
|
Subject: [PATCH] Fix hwdb paths
|
|
|
|
Patch by vcunat.
|
|
---
|
|
src/libsystemd/sd-hwdb/hwdb-internal.h | 6 +-----
|
|
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
|
|
diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h
|
|
index 5302679a62..39e59a527f 100644
|
|
--- a/src/libsystemd/sd-hwdb/hwdb-internal.h
|
|
+++ b/src/libsystemd/sd-hwdb/hwdb-internal.h
|
|
@@ -83,8 +83,4 @@ struct trie_value_entry2_f {
|
|
} _packed_;
|
|
|
|
#define hwdb_bin_paths \
|
|
- "/etc/systemd/hwdb/hwdb.bin\0" \
|
|
- "/etc/udev/hwdb.bin\0" \
|
|
- "/usr/lib/systemd/hwdb/hwdb.bin\0" \
|
|
- _CONF_PATHS_SPLIT_USR_NULSTR("systemd/hwdb/hwdb.bin") \
|
|
- UDEVLIBEXECDIR "/hwdb.bin\0"
|
|
+ "/etc/udev/hwdb.bin\0"
|