diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-07-07 02:51:03 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-07-08 15:23:47 +0300 |
| commit | 8bbfba48c47f22e6e91becc6fcd90a8f48940ec9 (patch) | |
| tree | d39bb378f94b2442b39cea12ec7e242d7a6983cf /pkgs/os-specific/linux/systemd | |
| parent | 1ac6f1fe259346ea1d058436ab80c8c47703e101 (diff) | |
| download | nixlib-8bbfba48c47f22e6e91becc6fcd90a8f48940ec9.tar nixlib-8bbfba48c47f22e6e91becc6fcd90a8f48940ec9.tar.gz nixlib-8bbfba48c47f22e6e91becc6fcd90a8f48940ec9.tar.bz2 nixlib-8bbfba48c47f22e6e91becc6fcd90a8f48940ec9.tar.lz nixlib-8bbfba48c47f22e6e91becc6fcd90a8f48940ec9.tar.xz nixlib-8bbfba48c47f22e6e91becc6fcd90a8f48940ec9.tar.zst nixlib-8bbfba48c47f22e6e91becc6fcd90a8f48940ec9.zip | |
systemd: move hwdb patch to the fork itself
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/systemd/hwdb-location.diff | 19 |
2 files changed, 0 insertions, 21 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 640e3db2a550..e3a49e68dd3d 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { sha256 = "1ig7jwmvaa1r4qlngjpnvvvvxhmzbxr171d257q4ryf87l93g1an"; }; - patches = [ ./hwdb-location.diff ]; - /* gave up for now! outputs = [ "out" "libudev" "doc" ]; # maybe: "dev" # note: there are many references to ${systemd}/... diff --git a/pkgs/os-specific/linux/systemd/hwdb-location.diff b/pkgs/os-specific/linux/systemd/hwdb-location.diff deleted file mode 100644 index 31e7a027f50d..000000000000 --- a/pkgs/os-specific/linux/systemd/hwdb-location.diff +++ /dev/null @@ -1,19 +0,0 @@ -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; |