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 AAhKKy+GJmFMmwAAgWs5BA (envelope-from ) for ; Wed, 25 Aug 2021 20:04:31 +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 uEncJi+GJmF2dAAAB5/wlQ (envelope-from ) for ; Wed, 25 Aug 2021 18:04:31 +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 135D73612 for ; Wed, 25 Aug 2021 20:04:31 +0200 (CEST) Received: from localhost ([::1]:56182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxGI-0008N8-38 for larch@yhetil.org; Wed, 25 Aug 2021 14:04:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxFr-0007po-QO for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36163) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxFr-0000np-Eh for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxFr-0002mW-8Y for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 02/52] gnu: elogind: Make #:configure-flags a G-exp. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:04:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991462910474 (code B ref 50201); Wed, 25 Aug 2021 18:04:03 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:03:49 +0000 Received: from localhost ([127.0.0.1]:47621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFY-0002hD-TS for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:48 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:50732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFU-0002fr-Al for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:42 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id lu3d2500J0mfAB406u3fSc; Wed, 25 Aug 2021 20:03:39 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:02:42 +0200 Message-Id: <20210825180332.5720-2-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914619; bh=o2P+6KSxN+ky4D9UZ8elUcdBStwnOvfrIurcVtK/UfE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IwxozxuD468exsAR9qfG8BC/llkg9hw59NqfDnasKPpsUawnb9Eb26xJO43PzUsW8 c3BOqH9mH86D06lr1K3sQKOUGn5yYYUrbyQB0RTk8zlHPp0maurhcGkQyf80+CzjI4 NUD8l/i7Yjbckh1jDqBCt2cMT5p7S/pfwUOuIcxBhWjotdy34BfsmNtrR4CfadASd7 TpuuKN7Zn8dWrFhEAx68k0ZK2ODj20gZPRExdf02aMkHR71eiI6C2FGv48Aw8ZIj2r 1l3vruMSAO9B39yekzvOine2leQsIUP4aQt5VTjXRcT6S6RvaR9nxKJeYgiPtMqYIw Tu+ojo/GiKFiA== 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=1629914671; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=o2P+6KSxN+ky4D9UZ8elUcdBStwnOvfrIurcVtK/UfE=; b=jQFweUKv7sv1LdTLmIr5phzT6YMU1UzgbAXCjwJ/xTpNzIql8xE/LHjSqzXq6YXNf0Fl1Y 3u2+4GIOrRbK4WnXrKtm9lAFSrQAgGhnVKBv0dmrHvg6D8CEgC3ch7iEXRrtVu05tfkxJT SycW772HQMDZ/0xWWuqzvF4eVhQ6o6Smkc0mdVnjiOhbdVxFdeC0ZuU9Drh+Sz5EA3j2WF NnyuCpVO9bSiD2WZMY35hoM3F+ZoUaoBHrr9LblGajlYLIAq8+5hWIwJpmNfdrSDxvS2WX pxchDq+VlPafmoUmeGx1eDfIIXFKfZlCsdl9P7olUjSjiFc/zTKA+SeNAZhx+g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629914671; a=rsa-sha256; cv=none; b=fej6lBefKSokfDALrudRANuYQRJKMlu8vjnW515dbWt9pdtK38wmocdlMXmFC3jJG6iwXn pMOf29brB1rHVBaCv5a0ufXKw9rW9jotUvIWlcxZKwzfu3U9dBzg+cIlEUsHqnC+7vRXho fLo+UCq1HePOqrXOj4AyjSIvc96qNUUvp36ORSAkIRaAb3asTy+8GOuu2a5MXvtUkWLJTL 4kjs3060nAXkcJPro/qUFWZofeKBCHt/KkXPueGWKQbU3vT/GtQSeJZo7kENWhJNFaf4p+ 1/PRt2QyZMFQtfPh5JCnJgR7tazvtyZw/JFxrcuputj/R116tcdqzHdPwSn5Zg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=IwxozxuD; 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: -0.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=IwxozxuD; 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: 135D73612 X-Spam-Score: -0.33 X-Migadu-Scanner: scn0.migadu.com X-TUID: L5myhWlNYMIN * gnu/packages/freedesktop.scm (elogind)[arguments]{configure-flags}: Let this be a G-exp. --- gnu/packages/freedesktop.scm | 56 +++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a7766edf04..e0f5623805 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2021 Brendan Tildesley ;;; Copyright © 2021 pineapples +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,6 +46,7 @@ #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -578,33 +580,33 @@ the freedesktop.org XDG Base Directory specification.") (build-system meson-build-system) (arguments `(#:configure-flags - (let* ((out (assoc-ref %outputs "out")) - (sysconf (string-append out "/etc")) - (libexec (string-append out "/libexec/elogind")) - (dbuspolicy (string-append out "/etc/dbus-1/system.d")) - (shadow (assoc-ref %build-inputs "shadow")) - (shepherd (assoc-ref %build-inputs "shepherd")) - (halt-path (string-append shepherd "/sbin/halt")) - (kexec-path "") ;not available in Guix yet - (nologin-path (string-append shadow "/sbin/nologin")) - (poweroff-path (string-append shepherd "/sbin/shutdown")) - (reboot-path (string-append shepherd "/sbin/reboot"))) - (list - (string-append "-Drootprefix=" out) - (string-append "-Dsysconfdir=" sysconf) - (string-append "-Drootlibexecdir=" libexec) - (string-append "-Ddbuspolicydir=" dbuspolicy) - (string-append "-Dc_link_args=-Wl,-rpath=" libexec) - (string-append "-Dcpp_link_args=-Wl,-rpath=" libexec) - (string-append "-Dhalt-path=" halt-path) - (string-append "-Dkexec-path=" kexec-path) - (string-append "-Dpoweroff-path=" poweroff-path) - (string-append "-Dreboot-path=" reboot-path) - (string-append "-Dnologin-path=" nologin-path) - "-Dcgroup-controller=elogind" - "-Dman=true" - ;; Disable some tests. - "-Dslow-tests=false")) + ,#~(let* ((out (assoc-ref %outputs "out")) + (sysconf (string-append out "/etc")) + (libexec (string-append out "/libexec/elogind")) + (dbuspolicy (string-append out "/etc/dbus-1/system.d")) + (shadow (assoc-ref %build-inputs "shadow")) + (shepherd (assoc-ref %build-inputs "shepherd")) + (halt-path (string-append shepherd "/sbin/halt")) + (kexec-path "") ;not available in Guix yet + (nologin-path (string-append shadow "/sbin/nologin")) + (poweroff-path (string-append shepherd "/sbin/shutdown")) + (reboot-path (string-append shepherd "/sbin/reboot"))) + (list + (string-append "-Drootprefix=" out) + (string-append "-Dsysconfdir=" sysconf) + (string-append "-Drootlibexecdir=" libexec) + (string-append "-Ddbuspolicydir=" dbuspolicy) + (string-append "-Dc_link_args=-Wl,-rpath=" libexec) + (string-append "-Dcpp_link_args=-Wl,-rpath=" libexec) + (string-append "-Dhalt-path=" halt-path) + (string-append "-Dkexec-path=" kexec-path) + (string-append "-Dpoweroff-path=" poweroff-path) + (string-append "-Dreboot-path=" reboot-path) + (string-append "-Dnologin-path=" nologin-path) + "-Dcgroup-controller=elogind" + "-Dman=true" + ;; Disable some tests. + "-Dslow-tests=false")) #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-pkttyagent-path -- 2.33.0