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/system.scm | |
| parent | 7bfb7a596493346ca2c2ba993e871e92537c2956 (diff) | |
| download | gnu-guix-dfc8ccbf5da96a67eb1cade499f0def21e7fdb02.tar gnu-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.scm')
| -rw-r--r-- | gnu/system.scm | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 01baa248a2..d3f2b82519 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -590,18 +590,13 @@ of PROVENANCE-SERVICE-TYPE to its services." bash-completion - ;; XXX: We don't use (canonical-package guile-2.2) here because that - ;; would create a collision in the global profile between the GMP - ;; variant propagated by 'guile-final' and the GMP variant propagated - ;; by 'gnutls', itself propagated by 'guix'. guile-2.2 guile-readline guile-colorized ;; The packages below are also in %FINAL-INPUTS, so take them from ;; there to avoid duplication. - (map canonical-package - (list bash coreutils findutils grep sed - diffutils patch gawk tar gzip bzip2 xz lzip)))) + (list bash coreutils findutils grep sed + diffutils patch gawk tar gzip bzip2 xz lzip))) (define %default-issue ;; Default contents for /etc/issue. |