diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-12-31 09:56:51 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2020-02-11 13:54:45 +0100 |
| commit | dfc8ccbf5da96a67eb1cade499f0def21e7fdb02 (patch) | |
| tree | 82aa7b635b05fb03051b33669829a2fd5a83af58 /gnu/installer.scm | |
| parent | 7bfb7a596493346ca2c2ba993e871e92537c2956 (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.scm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gnu/installer.scm b/gnu/installer.scm index 1676a91801f..6766037aaef 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm | |||
| @@ -291,18 +291,18 @@ selected keymap." | |||
| 291 | (define set-installer-path | 291 | (define set-installer-path |
| 292 | ;; Add the specified binary to PATH for later use by the installer. | 292 | ;; Add the specified binary to PATH for later use by the installer. |
| 293 | #~(let* ((inputs | 293 | #~(let* ((inputs |
| 294 | '#$(append (list bash ;start subshells | 294 | '#$(list bash ;start subshells |
| 295 | connman ;call connmanctl | 295 | connman ;call connmanctl |
| 296 | cryptsetup | 296 | cryptsetup |
| 297 | dosfstools ;mkfs.fat | 297 | dosfstools ;mkfs.fat |
| 298 | e2fsprogs ;mkfs.ext4 | 298 | e2fsprogs ;mkfs.ext4 |
| 299 | btrfs-progs ;mkfs.btrfs | 299 | btrfs-progs |
| 300 | jfsutils ;jfs_mkfs | 300 | jfsutils ;jfs_mkfs |
| 301 | kbd ;chvt | 301 | kbd ;chvt |
| 302 | guix ;guix system init call | 302 | guix ;guix system init call |
| 303 | util-linux ;mkwap | 303 | util-linux ;mkwap |
| 304 | shadow) | 304 | shadow |
| 305 | (map canonical-package (list coreutils))))) | 305 | coreutils))) |
| 306 | (with-output-to-port (%make-void-port "w") | 306 | (with-output-to-port (%make-void-port "w") |
| 307 | (lambda () | 307 | (lambda () |
| 308 | (set-path-environment-variable "PATH" '("bin" "sbin") inputs))))) | 308 | (set-path-environment-variable "PATH" '("bin" "sbin") inputs))))) |