guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/06: maint: Ensure substitutes are available for '%default-xorg-module


From: guix-commits
Subject: 02/06: maint: Ensure substitutes are available for '%default-xorg-modules'.
Date: Tue, 14 Apr 2020 10:02:21 -0400 (EDT)

civodul pushed a commit to branch version-1.1.0
in repository guix.

commit bab1f340b35078dcfd3cbac67ad56393b53bb46b
Author: Ludovic Courtès <address@hidden>
AuthorDate: Tue Apr 14 14:47:19 2020 +0200

    maint: Ensure substitutes are available for '%default-xorg-modules'.
    
    * etc/release-manifest.scm (%system-packages): Append
    %DEFAULT-XORG-MODULES.
---
 etc/release-manifest.scm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm
index ba2ab57..c2904c5 100644
--- a/etc/release-manifest.scm
+++ b/etc/release-manifest.scm
@@ -23,6 +23,7 @@
              (guix packages)
              (guix profiles)
              ((gnu ci) #:select (%cross-targets))
+             ((gnu services xorg) #:select (%default-xorg-modules))
              (guix utils)
              (srfi srfi-1)
              (srfi srfi-26))
@@ -49,16 +50,17 @@ TARGET."
 
 (define %system-packages
   ;; Key packages proposed by the Guix System installer.
-  (map specification->package
-       '("xorg-server" "xfce" "gnome" "mate" "enlightenment"
-         "openbox" "awesome" "i3-wm" "ratpoison"
-         "xlockmore" "slock" "libreoffice"
-         "connman" "network-manager" "network-manager-applet"
-         "openssh" "ntp" "tor"
-         "linux-libre" "grub-hybrid"
-         ;; FIXME: Add IceCat when Rust is available on i686.
-         ;;"icecat"
-         )))
+  (append (map specification->package
+               '("xorg-server" "xfce" "gnome" "mate" "enlightenment"
+                 "openbox" "awesome" "i3-wm" "ratpoison"
+                 "xlockmore" "slock" "libreoffice"
+                 "connman" "network-manager" "network-manager-applet"
+                 "openssh" "ntp" "tor"
+                 "linux-libre" "grub-hybrid"
+                 ;; FIXME: Add IceCat when Rust is available on i686.
+                 ;;"icecat"
+                 ))
+          %default-xorg-modules))
 
 (define %packages-to-cross-build
   ;; Packages that must be cross-buildable from x86_64-linux.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]