~ruther/guix-local: gnu: qemu-minimal: Actually remove unnecessary native-inputs.

0ef4da9f09d40c5ad8a0fb8e13b7e9ab68fd7977 — Marius Bakke 4 years ago 57f0118

gnu: qemu-minimal: Actually remove unnecessary native-inputs.

This is a follow-up to commit d64bd1254a015dfc999431dc65b6c5f210e8e334.

* gnu/packages/virtualization.scm (qemu-minimal)[native-inputs]: Filter static
outputs and remove "gettext-minimal" instead of "gettext".

patch browse .tar.gz .zip

1 files changed, 11 insertions(+), 3 deletions(-)

M gnu/packages/virtualization.scm

M gnu/packages/virtualization.scm => gnu/packages/virtualization.scm +11 -3

@@ 420,9 420,17 @@ server and embedded PowerPC, and S390 guests.")
            (delete 'install-user-static)))))
 
     ;; Remove dependencies on optional libraries, notably GUI libraries.
-    (native-inputs (modify-inputs (package-native-inputs qemu)
-                     (delete "gettext" "glib:static" "pcre:static"
-                             "zlib:static")))
+    (native-inputs (filter (lambda (input)
+                             (match input
+                               ;; Work around the fact that modify-inputs can not
+                               ;; delete specific outputs; i.e. here we should keep
+                               ;; `(,glib "bin"), but not `(,glib "static").
+                               ((label package output)
+                                (if (string=? "static" output)
+                                    #f #t))
+                               (_ input)))
+                        (modify-inputs (package-native-inputs qemu)
+                          (delete "gettext-minimal"))))
     (inputs (modify-inputs (package-inputs qemu)
               (delete "libusb"
                       "mesa"