- 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
wip/yesman
Vladimír Čunát
9 years ago
parent
ec7a4ddd92
commit
b44d846990
@ -0,0 +1,19 @@ |
||||
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;
|
||||
@ -0,0 +1,19 @@ |
||||
{ stdenv, systemd }: |
||||
|
||||
stdenv.mkDerivation { |
||||
name = "libudev-${systemd.version}"; |
||||
|
||||
unpackPhase = ":"; |
||||
outputs = [ "dev" "out" ]; |
||||
installPhase = '' |
||||
mkdir -p "$out/lib" "$dev/lib/pkgconfig" "$dev/include" |
||||
cp -P "${systemd}"/lib/libudev.* "$out/lib/" |
||||
cp -P "${systemd}"/lib/pkgconfig/libudev.pc "$dev/lib/pkgconfig/" |
||||
cp -P "${systemd}"/include/libudev.h "$dev/include/" |
||||
|
||||
substituteInPlace "$dev"/lib/pkgconfig/*.pc \ |
||||
--replace "${systemd}" "$out" |
||||
sed "/^includedir=/cincludedir=$dev/include" -i "$dev"/lib/pkgconfig/*.pc |
||||
''; |
||||
} |
||||
|
||||
Loading…
Reference in new issue