From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Marusich Subject: [PATCH 2/2] services: desktop: Use libmtp udev rules. Date: Sun, 25 Dec 2016 16:59:05 -0800 Message-ID: <20161226005905.1796-3-cmmarusich@gmail.com> References: <20161226005905.1796-1-cmmarusich@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cLJdl-0007MJ-K7 for guix-devel@gnu.org; Sun, 25 Dec 2016 19:59:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cLJdk-00074u-Py for guix-devel@gnu.org; Sun, 25 Dec 2016 19:59:49 -0500 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:34314) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cLJdk-00074p-KD for guix-devel@gnu.org; Sun, 25 Dec 2016 19:59:48 -0500 Received: by mail-pg0-x242.google.com with SMTP id b1so7624860pgc.1 for ; Sun, 25 Dec 2016 16:59:48 -0800 (PST) In-Reply-To: <20161226005905.1796-1-cmmarusich@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/services/desktop.scm (%modified-base-services): New variable. (%desktop-services): Use it. --- gnu/services/desktop.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 7555780ad..72f35950b 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Sou Bunnbu +;;; Copyright © 2016 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages suckless) #:use-module (gnu packages linux) + #:use-module (gnu packages libusb) #:use-module (guix records) #:use-module (guix packages) #:use-module (guix store) @@ -745,6 +747,16 @@ with the administrator's password." ;;; The default set of desktop services. ;;; +(define %modified-base-services + (modify-services %base-services + ;; Add the rules from libmtp. + (udev-service-type config => + (udev-configuration + (inherit config) + (rules + (cons* libmtp + (udev-configuration-rules config))))))) + (define %desktop-services ;; List of services typically useful for a "desktop" use case. (cons* (slim-service) @@ -766,6 +778,6 @@ with the administrator's password." (ntp-service) - %base-services)) + %modified-base-services)) ;;; desktop.scm ends here -- 2.11.0