mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 16:11:58 +00:00
b44d846990
- systemd puts all into one output now (except for man),
because I wasn't able to fix all systemd/udev refernces
for NixOS to work well
- libudev is now by default *copied* into another path,
which is what most packages will use as build input :-)
- pkgs.udev = [ libudev.out libudev.dev ]; because there are too many
references that just put `udev` into build inputs (to rewrite them all),
also this made "${udev}/foo" fail at *evaluation* time
so it's easier to catch and change to something more specific
20 lines
649 B
Diff
20 lines
649 B
Diff
diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c
|
|
index 06c9831..e74825c 100644
|
|
--- a/src/libsystemd/sd-hwdb/sd-hwdb.c
|
|
+++ b/src/libsystemd/sd-hwdb/sd-hwdb.c
|
|
@@ -268,13 +268,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) {
|
|
}
|
|
|
|
static const char hwdb_bin_paths[] =
|
|
- "/etc/systemd/hwdb/hwdb.bin\0"
|
|
"/etc/udev/hwdb.bin\0"
|
|
- "/usr/lib/systemd/hwdb/hwdb.bin\0"
|
|
-#ifdef HAVE_SPLIT_USR
|
|
- "/lib/systemd/hwdb/hwdb.bin\0"
|
|
-#endif
|
|
- UDEVLIBEXECDIR "/hwdb.bin\0";
|
|
+ ;
|
|
|
|
_public_ int sd_hwdb_new(sd_hwdb **ret) {
|
|
_cleanup_hwdb_unref_ sd_hwdb *hwdb = NULL;
|