From 1ac6f1fe259346ea1d058436ab80c8c47703e101 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 7 Jul 2016 02:50:30 +0300
Subject: [PATCH 1/3] systemd: update fork revision
---
pkgs/os-specific/linux/systemd/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 0ba6c431c9f7..640e3db2a550 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "NixOS";
repo = "systemd";
- rev = "4ccee551f2ba8383c8b9bd06590a3cd1dfdf690f";
- sha256 = "1i4my5z7f8g5bykv1vxyw1az66s087lfqrck79kdm4hgvb4lsk6y";
+ rev = "81d5aaac06b43fd72f5ab02734a17cbfb55d1f5b";
+ sha256 = "1ig7jwmvaa1r4qlngjpnvvvvxhmzbxr171d257q4ryf87l93g1an";
};
patches = [ ./hwdb-location.diff ];
From 8bbfba48c47f22e6e91becc6fcd90a8f48940ec9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 7 Jul 2016 02:51:03 +0300
Subject: [PATCH 2/3] systemd: move hwdb patch to the fork itself
---
pkgs/os-specific/linux/systemd/default.nix | 2 --
.../linux/systemd/hwdb-location.diff | 19 -------------------
2 files changed, 21 deletions(-)
delete mode 100644 pkgs/os-specific/linux/systemd/hwdb-location.diff
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;
From 00e67f0df000268a0bd5cefb81f4c32068a33420 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 7 Jul 2016 02:51:20 +0300
Subject: [PATCH 3/3] systemd: use plymouth from system path
---
pkgs/os-specific/linux/systemd/default.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index e3a49e68dd3d..05cef1ffd505 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -97,7 +97,8 @@ stdenv.mkDerivation rec {
--replace /bin/echo ${coreutils}/bin/echo \
--replace /bin/cat ${coreutils}/bin/cat \
--replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \
- --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck
+ --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \
+ --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency
done
substituteInPlace src/journal/catalog.c \