1 files changed, 13 insertions, 3 deletions
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index 287c65f16..aca70186b 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -6,7 +6,9 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
-pkgname+=('libsystemd-standalone' 'libudev' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
+# We split Arch's libsystemd into the following:
+_libsystemd=('libsystemd-standalone' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
+pkgname+=("${_libsystemd[@]}")
 # latest commit on stable branch
 _commit='d52e2bb9c20216972754c054e8534bca28baab66'
 # Bump this to latest major release for signed tag verification,
@@ -207,7 +209,7 @@ build() {
   mv "$srcdir/dest"/systemd/usr/share/man/man3/*udev* -t "$srcdir/dest"/libudev/usr/share/man/man3/
 
   local nssmodule
-  for nssmodule in myhostname mymachines resolve; do
+  for nssmodule in systemd myhostname mymachines resolve; do
     install -dm755 "$srcdir/dest/nss-$nssmodule"/usr/{lib,share/man/man8}
     mv -T "$srcdir/dest"/{systemd,nss-$nssmodule}/usr/share/man/man8/nss-$nssmodule.8
     mv -T "$srcdir/dest"/{systemd,nss-$nssmodule}/usr/share/man/man8/libnss_$nssmodule.*.8
@@ -304,7 +306,7 @@ package_systemd() {
 
 package_libsystemd() {
   pkgdesc="systemd client libraries metapackage"
-  depends=(libsystemd-standalone libudev nss-myhostname nss-mymachines nss-resolve)
+  depends=("${_libsystemd[@]}")
   license=('GPL2')
 }
 
@@ -326,6 +328,14 @@ package_libudev() {
   cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
 }
 
+package_nss-systemd() {
+  pkgdesc="NSS module providing user and group resolution for dynamic users and groups"
+  depends=('glibc' 'libcap')
+  license=('GPL2')
+
+  cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
+}
+
 package_nss-myhostname() {
   pkgdesc="NSS module providing hostname resolution for the locally configured system hostname"
   depends=('glibc' 'libcap')