summaryrefslogtreecommitdiff
path: root/gnu/installer.scm
diff options
context:
space:
mode:
authorMathieu Othacehe <m.othacehe@gmail.com>2019-12-31 09:56:51 +0100
committerMathieu Othacehe <m.othacehe@gmail.com>2020-02-11 13:54:45 +0100
commitdfc8ccbf5da96a67eb1cade499f0def21e7fdb02 (patch)
tree82aa7b635b05fb03051b33669829a2fd5a83af58 /gnu/installer.scm
parent7bfb7a596493346ca2c2ba993e871e92537c2956 (diff)
system: Stop using canonical-package.
Usage of canonical-package outside of thunked fields breaks cross-compilation, see: https://lists.gnu.org/archive/html/guix-devel/2019-12/msg00410.html. * gnu/installer.scm (installer-program): Remove canonical-package. * gnu/services/base.scm (<nscd-cache>): Ditto, (%base-services): ditto. * gnu/services/xorg.scm: Remove useless canonical-package import. * gnu/system.scm (%base-packages): Remove canonical-package. * gnu/system/install.scm (%installation-services): Ditto, (installation-os): ditto. * gnu/system/locale.scm (single-locale-directory): Ditto.
Diffstat (limited to 'gnu/installer.scm')
-rw-r--r--gnu/installer.scm24
1 files changed, 12 insertions, 12 deletions
diff --git a/gnu/installer.scm b/gnu/installer.scm
index 1676a91801..6766037aae 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -291,18 +291,18 @@ selected keymap."
(define set-installer-path
;; Add the specified binary to PATH for later use by the installer.
#~(let* ((inputs
- '#$(append (list bash ;start subshells
- connman ;call connmanctl
- cryptsetup
- dosfstools ;mkfs.fat
- e2fsprogs ;mkfs.ext4
- btrfs-progs ;mkfs.btrfs
- jfsutils ;jfs_mkfs
- kbd ;chvt
- guix ;guix system init call
- util-linux ;mkwap
- shadow)
- (map canonical-package (list coreutils)))))
+ '#$(list bash ;start subshells
+ connman ;call connmanctl
+ cryptsetup
+ dosfstools ;mkfs.fat
+ e2fsprogs ;mkfs.ext4
+ btrfs-progs
+ jfsutils ;jfs_mkfs
+ kbd ;chvt
+ guix ;guix system init call
+ util-linux ;mkwap
+ shadow
+ coreutils)))
(with-output-to-port (%make-void-port "w")
(lambda ()
(set-path-environment-variable "PATH" '("bin" "sbin") inputs)))))