From patchwork Fri Oct 1 14:21:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33511 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 EDE4F27BBE4; Fri, 1 Oct 2021 15:28:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9C61E27BBE1 for ; Fri, 1 Oct 2021 15:28:53 +0100 (BST) Received: from localhost ([::1]:48362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJWu-0005bi-L7 for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:28:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJW7-0004zC-JB for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45468) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJW7-0002Oi-Bh for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJW7-0005nQ-8e for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 29/38] gnu: freedesktop: Unconditionally use alternatives to % variables. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309846122216 (code B ref 50905); Fri, 01 Oct 2021 14:28:03 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:27:41 +0000 Received: from localhost ([127.0.0.1]:57006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVk-0005mF-Re for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:41 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:47630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVf-0005lR-JT for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:37 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4HLXNt69YmzMqhGm for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:50 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMqMb; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:31 +0200 Message-Id: <20211001142140.17027-29-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098110; bh=9bXXNf5sim3mWFDknGYsD4UkcW172PltQqj2lChp1sg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qes/Z0MO2FxWYjAb1tJrAjKwwjlzefmhUGpAPbvg0h96fYBAxYtoa+gLxG/72Dm0f rjpmV9895q2aErzWaQqJ7ny49Slso4Wfim0edRrtRXiK9feSRq4admSoG7GCVWuG5P LUHwLLXi0pmy3e7e+r1deWl7V81m8aEwmZzpdvOH//in2ndrfLDDGMFCQLN9QyWmW0 UmDr2Oy/X5mb0ND079FdiJe48zt8QnPaTm38l0Y4+jxpYCFu9B56ARehfCHAmpvgpy O29MmM/2yP52kIQYeiyLkWwE5HkhVBtUEzJEKYnCH8lJTgYePLw9kIx6hoUk2jIFzw v0tDT8SVlxrIA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 * gnu/packages/freedesktop.scm (elogind)[arguments]<#:configure-flags>: Use #$output and this-package-input instead of %outputs and %build-inputs. --- gnu/packages/freedesktop.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 550253bc34..9bcf2d8d3e 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -583,20 +583,12 @@ the freedesktop.org XDG Base Directory specification.") (build-system meson-build-system) (arguments `(#:configure-flags - ;; TODO(core-updates): Use #$output unconditionally. - ,#~(let* ((out #$(if (%current-target-system) - #~#$output - #~(assoc-ref %outputs "out"))) + ,#~(let* ((out #$output) (sysconf (string-append out "/etc")) (libexec (string-append out "/libexec/elogind")) (dbuspolicy (string-append out "/etc/dbus-1/system.d")) - ;; TODO(core-updates): use this-package-input unconditionally. - (shadow #$(if (%current-target-system) - (this-package-input "shadow") - #~(assoc-ref %build-inputs "shadow"))) - (shepherd #$(if (%current-target-system) - (this-package-input "shepherd") - #~(assoc-ref %build-inputs "shepherd"))) + (shadow #$(this-package-input "shadow")) + (shepherd #$(this-package-input "shepherd")) (halt-path (string-append shepherd "/sbin/halt")) (kexec-path "") ;not available in Guix yet (nologin-path (string-append shadow "/sbin/nologin"))