From patchwork Sun Apr 28 12:14:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Diego Nicola Barbato X-Patchwork-Id: 13806 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EA46416F50; Sun, 28 Apr 2019 13:15:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 35EAD16ECD for ; Sun, 28 Apr 2019 13:15:08 +0100 (BST) Received: from localhost ([127.0.0.1]:43644 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKii2-0006Tn-L0 for patchwork@mira.cbaines.net; Sun, 28 Apr 2019 08:15:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKii0-0006Tb-0K for guix-patches@gnu.org; Sun, 28 Apr 2019 08:15:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hKihz-0000sp-2D for guix-patches@gnu.org; Sun, 28 Apr 2019 08:15:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51559) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hKihy-0000sj-Uu for guix-patches@gnu.org; Sun, 28 Apr 2019 08:15:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hKihy-0005Ul-NP for guix-patches@gnu.org; Sun, 28 Apr 2019 08:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35470] [PATCH] services: slim: Honor the value of slim from slim-configuration. Resent-From: Diego Nicola Barbato Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Apr 2019 12:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35470 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35470@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155645367721072 (code B ref -1); Sun, 28 Apr 2019 12:15:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Apr 2019 12:14:37 +0000 Received: from localhost ([127.0.0.1]:36870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKihZ-0005To-ED for submit@debbugs.gnu.org; Sun, 28 Apr 2019 08:14:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKihX-0005Tb-9B for submit@debbugs.gnu.org; Sun, 28 Apr 2019 08:14:36 -0400 Received: from lists.gnu.org ([209.51.188.17]:37895) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hKihS-0000mZ-1M for submit@debbugs.gnu.org; Sun, 28 Apr 2019 08:14:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKihR-0006Qx-0t for guix-patches@gnu.org; Sun, 28 Apr 2019 08:14:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hKihP-0000m5-Pu for guix-patches@gnu.org; Sun, 28 Apr 2019 08:14:29 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40907) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hKihP-0000l9-72 for guix-patches@gnu.org; Sun, 28 Apr 2019 08:14:27 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 42D902400E5 for ; Sun, 28 Apr 2019 14:14:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1556453663; bh=WMw1rc/5i9j5nURAkig4ZuIPZlCATxjLEsaF+sLznbo=; h=From:To:Subject:Date:From; b=aUevRzvclGeaUc4fiky5D++A1sCWdhKqZ+u+xMyN2xKYCTsiMhlREjAf9YGK+dlbK 6xFTQd17p10ZbisWUmLit1OfXuAhYrmlGlF3U9nsf4PdexP3Xo14aK04CPu4RdcDUF baIcarqj37Oid2aV7QRO20C3GbEgZS13eEZ84fVINbAgnWzUpuG1DobJ/k7phdo/L5 lIawPF4/Qq7T4MYLIa2H8AL596O7AmEbk9Sa6E8ZgnbAEvpGtHVMz6OU13d+NCeCoG i7jEjrrZ7zQXJBk0slWWlD+1rZRcDTmoT3DWW5DkuvidEhIt1qr+MkIB8sdKmx5z9q QI4bCatqvHdNg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 44sRYB2lKdz9rxD for ; Sun, 28 Apr 2019 14:14:22 +0200 (CEST) From: Diego Nicola Barbato Date: Sun, 28 Apr 2019 14:14:21 +0200 Message-ID: <87ef5m9vj6.fsf@GlaDOS.home> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Guix, I have noticed that setting the slim field in slim-configuration does not have any effect. This patch should fix that. Regards, Diego From 85c4a2764baba987d1ddd4dd67f7d33f9e49e9ea Mon Sep 17 00:00:00 2001 From: Diego Nicola Barbato Date: Sat, 27 Apr 2019 19:45:47 +0200 Subject: [PATCH] services: slim: Honor the value of slim from slim-configuration. Previously setting the slim field in slim-configuration would have no effect. * gnu/services/xorg.scm (slim-shepherd-service): Remove unused let binding for slim. Use (slim-configuration-slim config) instead of the default slim. --- gnu/services/xorg.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index d4e73c13b4..44dcec4ec9 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -502,7 +502,6 @@ desktop session from the system or user profile will be used." (define slim.cfg (let ((xinitrc (xinitrc #:fallback-session (slim-configuration-auto-login-session config))) - (slim (slim-configuration-slim config)) (xauth (slim-configuration-xauth config)) (startx (xorg-start-command (slim-configuration-xorg config))) (shepherd (slim-configuration-shepherd config)) @@ -547,7 +546,9 @@ reboot_cmd " shepherd "/sbin/reboot\n" (false-if-exception (delete-file "/var/run/slim.lock")) (fork+exec-command - (list (string-append #$slim "/bin/slim") "-nodaemon") + (list (string-append #$(slim-configuration-slim config) + "/bin/slim") + "-nodaemon") #:environment-variables (list (string-append "SLIM_CFGFILE=" #$slim.cfg) #$@(if theme -- 2.21.0