aboutsummaryrefslogtreecommitdiff
path: root/gnu/system/install.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/system/install.scm
parent7bfb7a596493346ca2c2ba993e871e92537c2956 (diff)
downloadguix-dfc8ccbf5da96a67eb1cade499f0def21e7fdb02.tar
guix-dfc8ccbf5da96a67eb1cade499f0def21e7fdb02.tar.gz
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/system/install.scm')
-rw-r--r--gnu/system/install.scm7
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index c15c2c7814..0dc26b2871 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -384,8 +384,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
;; Having /bin/sh is a good idea. In particular it allows Tramp
;; connections to this system to work.
(service special-files-service-type
- `(("/bin/sh" ,(file-append (canonical-package bash)
- "/bin/sh"))))
+ `(("/bin/sh" ,(file-append bash "/bin/sh"))))
;; Loopback device, needed by OpenSSH notably.
(service static-networking-service-type
@@ -408,7 +407,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
(list bare-bones-os
glibc-utf8-locales
texinfo
- (canonical-package guile-2.2))))))
+ guile-2.2)))))
(define %issue
;; Greeting.
@@ -480,7 +479,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
;; Explicitly allow for empty passwords.
(base-pam-services #:allow-empty-passwords? #t))
- (packages (cons* (canonical-package glibc) ;for 'tzselect' & co.
+ (packages (cons* glibc ;for 'tzselect' & co.
parted gptfdisk ddrescue
fontconfig
font-dejavu font-gnu-unifont