From 0ef4da9f09d40c5ad8a0fb8e13b7e9ab68fd7977 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Dec 2021 00:43:24 +0100 Subject: [PATCH] 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". --- gnu/packages/virtualization.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 839b12d040..14f415cf1d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -420,9 +420,17 @@ (define-public qemu-minimal (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"