From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 5oq7HUjnVGFcKQAAgWs5BA (envelope-from ) for ; Thu, 30 Sep 2021 00:23:04 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id IIa0GEjnVGEUGgAAbx9fmQ (envelope-from ) for ; Wed, 29 Sep 2021 22:23:04 +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 207DBDF13 for ; Thu, 30 Sep 2021 00:23:04 +0200 (CEST) Received: from localhost ([::1]:48924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhyg-0002Lc-0j for larch@yhetil.org; Wed, 29 Sep 2021 18:23:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwx-0007FP-WF for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39204) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwx-0002HQ-L9 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwx-0000mU-GZ for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 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: Wed, 29 Sep 2021 22:21:15 +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: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540362690 (code B ref 50905); Wed, 29 Sep 2021 22:21:15 +0000 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:36 +0000 Received: from localhost ([127.0.0.1]:50715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwK-0000hF-ER for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:36 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvh-0000ZP-Bn for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:10 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKxS9; Thu, 30 Sep 2021 00:19:57 +0200 From: Maxime Devos Date: Thu, 30 Sep 2021 00:19:29 +0200 Message-Id: <20210929221938.17168-29-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-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=1632953997; bh=9bXXNf5sim3mWFDknGYsD4UkcW172PltQqj2lChp1sg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XeS6ovTH6V1GbszCLUvG4JO3NYZQDC3PrR651t4FMF6lVgICi4sXNGfPa7g2guSAt 0NXeUAEwaNzM0nQDgs0f/6tw2Z2F+H7ILQT8p9y9YkcUxXtfm5FGhXCZFxCSVekPel QsQ3ZJ2pSOlPT2c8KU4sc8Z0ZqXiQ3mFodDo+PHskp6zJbgbaCOs5s+e5h0Jwn4ydn aWoumvRRYVrbfmAMrPjN8CNalBg4Z8a70pDmgroZHrorwUb/K0pLtVuSo/mAZSMHrR +eI9qiyViSyqGVhnt6Gr6tanI3lip4jyMYm7g+AWadFigOR/jickNWiZFIg9yBgiqS b99rKfbnPr84Q== 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=1632954184; 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=XCBRODPcb27yYHEwCivq7Cz+wbznVZzIsaE//y+1ojfA6QSUKF473ZP2M8oqYKXKmsEiI4 Ggg3GNysJ7l2jTTIXwZf4BDVsl9RriJgJ0wCnk/P4I1VHwroYcOb36ZkdUdGBn6bO1kPGP IzpX8HOHDnvQCF8sz1KlpQWsloodW9Gh9dGgxGQJIvIeXIsHS70bF5XqTvUV+GrI3GEU96 YecSTe5zvIOsxhy3Atse2OpibpbEb5hN8n0uPlbhFgcpsi9zcE9uxS3thmemcL6jdJpD0x Gh/31RpMJGywpUL54Y5pEtGD+TFGoJqB53+OLBUr6d4xi4DZ91TosYRodCSdVA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632954184; a=rsa-sha256; cv=none; b=AuOgKE+zYYI6zyBXSan6DIPaKlcjCvux3gfm0xk+kkBldTEwTwQ6LwtpIKFT56pZeth8Uy Ntarqxn/xs5Y4hbJyFCk9ofdOQYPb/wb90NqpOmHWtQDTcN4hgjy18VdTEob6Qqmj2lWOR VT2uo5xO45e70aCtp4yE3fG8KcaRtNdcM0WXzgBDUvhXeUprum6wbI1UuajxEUt35LSX8c ahl0QpSOQjKrmdvHuVGGSPDtvBC6jYzCpVgF9Cb+llKHvsdt8FuqOboZIsoir5pQhKjz71 LsGkVyqxj+hilBr4ngls5FXuirozUvTa1oLZAD527crD9W9QNoYjGQdpwyKyCQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=XeS6ovTH; 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.20 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=XeS6ovTH; 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: 207DBDF13 X-Spam-Score: 3.20 X-Migadu-Scanner: scn1.migadu.com X-TUID: 2RAGXoN1Gamf * 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