bug#33896: [PATCH 2/2] gnu: libblockdev: Fix inputs.

[Sarah Morgensen]

Add missing inputs; make util-linux a regular input since libblockdev
retains references to it.

* gnu/packages/disk.scm (libblockdev):
[inputs]: Add bcache-tools, e2fsprogs, gptfdisk, multipath-tools, ntfs-3g,
util-linux, and xfsprogs.
[native-inputs]: Remove util-linux.
---
 gnu/packages/disk.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index f3a7eb7617..a233db9433 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -951,26 +951,30 @@ to create devices with respective mappings for the 
ATARAID sets discovered.")
     (native-inputs
      `(("gobject-introspection" ,gobject-introspection)
        ("pkg-config" ,pkg-config)
-       ("python" ,python-wrapper)
-       ("util-linux" ,util-linux)))
+       ("python" ,python-wrapper)))
     (inputs
-     `(("btrfs-progs" ,btrfs-progs)
+     `(("bcache-tools" ,bcache-tools)
+       ("btrfs-progs" ,btrfs-progs)
        ("cryptsetup" ,cryptsetup)
        ("dosfstools" ,dosfstools)
        ("dmraid" ,dmraid)
+       ("e2fsprogs" ,e2fsprogs)
        ("eudev" ,eudev)
        ("glib" ,glib)
+       ("gptfdisk" ,gptfdisk)
        ("kmod" ,kmod)
        ("libbytesize" ,libbytesize)
        ("libyaml" ,libyaml)
        ("lvm2" ,lvm2)
        ("mdadm" ,mdadm)
+       ("multipath-tools" ,multipath-tools)
        ("ndctl" ,ndctl)
        ("nss" ,nss)
+       ("ntfs-3g" ,ntfs-3g)
        ("parted" ,parted)
+       ("util-linux" ,util-linux)
        ("volume-key" ,volume-key)
-       ;; ("xfsprogs" ,xfsprogs) ; TODO: Package?
-       ))
+       ("xfsprogs" ,xfsprogs)))
     (home-page "https://github.com/storaged-project/libblockdev";)
     (synopsis "Library for manipulating block devices")
     (description
-- 
2.33.0