[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49672] [PATCH v2 5/6] gnu: Query membership in ‘supported-systems’
From: |
Thiago Jung Bauermann |
Subject: |
[bug#49672] [PATCH v2 5/6] gnu: Query membership in ‘supported-systems’ list with Nix identifier |
Date: |
Sun, 27 Mar 2022 18:40:25 -0300 |
Packages’ ‘supported-systems’ list contains Nix system identifiers, while
‘%current-target-system’ contains a GNU triplet. We need to use
‘current-target-nix-system’ to query the list, which always returns a Nix
system identifier.
* gnu/packages/bootloaders.scm (grub)[inputs]: Use ‘current-target-nix-system’
to query membership in (package-supported-systems).
---
gnu/packages/bootloaders.scm | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 40dd38fdd28a..98970450900e 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -185,16 +185,14 @@ (define-public grub
;; Depend on LVM2 for libdevmapper, used by 'grub-probe' and
;; 'grub-install' to recognize mapped devices (LUKS, etc.)
- ,@(if (member (or (%current-target-system)
- (%current-system))
+ ,@(if (member (current-target-nix-system)
(package-supported-systems lvm2))
`(("lvm2" ,lvm2))
'())
;; Depend on mdadm, which is invoked by 'grub-probe' and 'grub-install'
;; to determine whether the root file system is RAID.
- ,@(if (member (or (%current-target-system)
- (%current-system))
+ ,@(if (member (current-target-nix-system)
(package-supported-systems mdadm))
`(("mdadm" ,mdadm))
'())
@@ -205,8 +203,7 @@ (define-public grub
;; Needed for ‘grub-mount’, the only reliable way to tell whether a
given
;; file system will be readable by GRUB without rebooting.
- ,@(if (member (or (%current-target-system)
- (%current-system))
+ ,@(if (member (current-target-nix-system)
(package-supported-systems fuse))
`(("fuse" ,fuse))
'())
- [bug#49672] [PATCH v2 0/6] Target check fixes for cross compilation, Thiago Jung Bauermann, 2022/03/27
- [bug#49672] [PATCH v2 1/6] gnu: Fix GNU/Linux system detection, Thiago Jung Bauermann, 2022/03/27
- [bug#49672] [PATCH v2 2/6] gnu: libgc: Use default argument in ‘target-hurd?’ call, Thiago Jung Bauermann, 2022/03/27
- [bug#49672] [PATCH v2 6/6] gnu: Fix check of ‘%current-system’ and ‘%current-target-system’, Thiago Jung Bauermann, 2022/03/27
- [bug#49672] [PATCH v2 4/6] gnu: Use ‘current-target-nix-system’ for matches, Thiago Jung Bauermann, 2022/03/27
- [bug#49672] [PATCH v2 5/6] gnu: Query membership in ‘supported-systems’ list with Nix identifier,
Thiago Jung Bauermann <=
- [bug#49672] [PATCH v2 3/6] utils: Introduce the ‘current-target-nix-system’ procedure, Thiago Jung Bauermann, 2022/03/27
- [bug#49672] [PATCH v2 0/6] Target check fixes for cross compilation, Maxime Devos, 2022/03/28