diff options
| author | shtwzrd <shtwzrd@protonmail.com> | 2020-02-09 21:31:09 +0000 |
|---|---|---|
| committer | Jakub Kądziołka <kuba@kadziolka.net> | 2020-02-16 00:02:10 +0100 |
| commit | 779d96c9b0ee38cbaca9f8577e6cc7f907fb29cb (patch) | |
| tree | f46dc95f9e96bf5eee2f30012b2b6358b0c1d44e | |
| parent | c66f3b3bec196cf0e39bd0a0ffe267aad43eb423 (diff) | |
| download | guix-779d96c9b0ee38cbaca9f8577e6cc7f907fb29cb.tar.gz | |
services: xorg: Filter modules based on system
Fixes <https://bugs.gnu.org/39402>. Reported by shtwzrd <shtwzrd@protonmail.com>. * gnu/services/xorg.scm (xorg-configuration): Apply a filter over %default-xorg-modules packages, excluding those for which the %current-system is not among the package's supported-systems. This patch makes it possible to use xorg-configuration on systems other than x86_64 and i686, as without it, xf86-video-intel would be pulled in on the unsupported architecture and fail. Signed-off-by: Jakub Kądziołka <kuba@kadziolka.net>
| -rw-r--r-- | gnu/services/xorg.scm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 73a32e4b02..df5c350a37 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018, 2019 Timothy Sample <samplet@ngyro.com> ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de> +;;; Copyright © 2020 shtwzrd <shtwzrd@protonmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -152,7 +153,12 @@ xorg-configuration make-xorg-configuration xorg-configuration? (modules xorg-configuration-modules ;list of packages - (default %default-xorg-modules)) + ; filter out modules not supported on current system + (default (filter + (lambda (p) + (member (%current-system) + (package-supported-systems p))) + %default-xorg-modules))) (fonts xorg-configuration-fonts ;list of packges (default %default-xorg-fonts)) (drivers xorg-configuration-drivers ;list of strings |