[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/08: gnu: qemu-minimal: Actually remove unnecessary native-inputs.
From: |
guix-commits |
Subject: |
07/08: gnu: qemu-minimal: Actually remove unnecessary native-inputs. |
Date: |
Wed, 22 Dec 2021 21:15:19 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit 0ef4da9f09d40c5ad8a0fb8e13b7e9ab68fd7977
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Dec 19 00:43:24 2021 +0100
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 839b12d..14f415c 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -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"
- branch master updated (867c33d -> f37c999), guix-commits, 2021/12/22
- 02/08: gnu: rsync: Remove 3.1.3., guix-commits, 2021/12/22
- 03/08: gnu: gcl: Avoid referencing GCC from the top-level., guix-commits, 2021/12/22
- 04/08: gnu: seabios: Update to 1.15.0., guix-commits, 2021/12/22
- 07/08: gnu: qemu-minimal: Actually remove unnecessary native-inputs.,
guix-commits <=
- 08/08: gnu: libksba: Fix cross-compilation., guix-commits, 2021/12/22
- 01/08: chromium-extension: Avoid another usage of the store-mapped /tmp., guix-commits, 2021/12/22
- 06/08: gnu: seabios: Build vgabios targets., guix-commits, 2021/12/22
- 05/08: gnu: seabios: Encode version information in the binary., guix-commits, 2021/12/22