From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gC8uGCIbV2FRFAAAgWs5BA (envelope-from ) for ; Fri, 01 Oct 2021 16:28:50 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 2JfREyIbV2GfbAAAB5/wlQ (envelope-from ) for ; Fri, 01 Oct 2021 14:28:50 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F349ED315 for ; Fri, 1 Oct 2021 16:28:49 +0200 (CEST) Received: from localhost ([::1]:48362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJWr-0005bi-4e for larch@yhetil.org; Fri, 01 Oct 2021 10:28:49 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1633098530; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=9bXXNf5sim3mWFDknGYsD4UkcW172PltQqj2lChp1sg=; b=Qh8mGI6/QeVtDa/f+iePxZbbkQIfgWUs5GOHtqhxXLbU5FIkDDHTi2UnfzokF0sMa1CIwS b2v0MLai2EY0zHyR1PWxs1t3kmSwl+vwbX2g+tCbWlR9Z/RCVhN618Tqv/4V2BN7R2hBeY hEf6fxZ4TWTqlSelY6ncEaU63xCXkKflseeJ12giztHvx92QzMFUDw/Ac1VjSAtAkBgDgN 4oi4jsW9bC5zUpHzIL2oYyxR7c3IUuRXfiiufj/vsa/DUQVTqD7g7CHoh7HPE4iA5Ci4tk DZvYt5GMFu1hCFxOLMbTi76JV3JqMJ8Dofm8qFEQyQacEaLnPGIia96+1XJPlw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633098530; a=rsa-sha256; cv=none; b=ual4F7JLsYs8FMZQZsZ9/vYpjUTntHgPGX5yc5Vca+FbXMLNXfaqvN0TJZCTdIXQW5TSsk CFxTKDK+dCPJDpUY18Cp6hePmKS5Q2nOv1P1WH5eF+oXCR+pZQKdjMulYGMkoXNjzt4wjW UTtmKqR6DX1V9a+WfH9818DvtQryoE8wlwxRCr6iBLAdfQiUTKjTu85n8MZGL9DfZ4EEbO 1CfhIsFDK411OU8OJ3p7tBjBMyCOm1zGYx6z2txHQr595nBrtSbXMhBKnOFIK1U+gssv/V ZOOLIz3VbJPRGbXjSlLrM+HYUQhvXzYCg+4T+oWr7jNHsLjGSORe57OZXmiPaA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="qes/Z0MO"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.10 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="qes/Z0MO"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: F349ED315 X-Spam-Score: 3.10 X-Migadu-Scanner: scn1.migadu.com X-TUID: dcibyNN3sGyI * 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")) -- 2.33.0