From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id eJHJDh6GJmE+mAAAgWs5BA (envelope-from ) for ; Wed, 25 Aug 2021 20:04:14 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id iPluCh6GJmEGcwAAB5/wlQ (envelope-from ) for ; Wed, 25 Aug 2021 18:04:14 +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 E100E2BBF9 for ; Wed, 25 Aug 2021 20:04:12 +0200 (CEST) Received: from localhost ([::1]:55460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxFw-0007qO-5V for larch@yhetil.org; Wed, 25 Aug 2021 14:04:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxFr-0007pS-0V for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36158) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxFq-0000nP-PW for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxFq-0002mH-LJ for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 03/52] gnu: elogind: Fix cross-compilation. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:04:02 +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.162991462510370 (code B ref 50201); Wed, 25 Aug 2021 18:04:02 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:03:45 +0000 Received: from localhost ([127.0.0.1]:47611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFX-0002gf-Ly for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:44 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:50746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFV-0002ft-0Y for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:41 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id lu3d2500J0mfAB406u3gT0; Wed, 25 Aug 2021 20:03:40 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:02:43 +0200 Message-Id: <20210825180332.5720-3-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-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914620; bh=8mKjxkd3JNJoIdwZnTrV1aelukG3WYjEvqoBuHQblIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=r4Z+L59Oa4eS/bHnXa+aG5R30kur9JWH8jHQ5MOjlXRCXLBqoXmxACNB8S0kF2RGO uMH3TZqtueAJQsjVx8NjCou96DS95Wijl8g/fzaXAgdK9juc1++/9DprPYrQ2o1MWu muLquJjmozKZmMxR5drjLeA2Sk0BIvN08KlGr7FwcAqU68F15Slxt2GK7CcpHqX5n+ pzk8vpstNQ4Ju+hs8DzFEYlRfAIbiHCA3IUBe49dQSUw7SgnFhepyQwOINTIoOW/Ts uCWJK70tjrdPDfxfRLHlcFRVFhvDy1p7VYoT9EBo0sLzxy4cct3Tu955CVVvp1eY/q HEgxn1UwpXU5w== 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=1629914653; 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=8mKjxkd3JNJoIdwZnTrV1aelukG3WYjEvqoBuHQblIE=; b=ZftcwZDx31ZUKnIHbwrMG6EJUD0Q3jsw7U96PnV96Pu+10CU5hH8iJU1QfibCTK26NeZy9 ecAiVnuv+UZNV1rMPvLFzKQZhosAgqCAReR5tERtQBRYR4fne9kbieYVUtNARC4KjtaGlw qtU60WpvL6nWtFSeQMiVd+iC7HMA8w21ydfU9FoXoFDp9IJKwa4GbYzc/Q7MGjiMvA8xdb KszDBdRn8JlqiN9QBgbfan8jlBGxItP1JwUIemZFbXb4hyHIPnm6zEe5D/s2t3ajSt7Qbl RZpvua2+T33jVwzlWJ4zYbdOYO+cd+2trQsiNvgewXx8L1Q9hlHPwqMNhRvfCQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629914653; a=rsa-sha256; cv=none; b=QUTZZoWFThxyt/PYcbBvgigH6myBc5jLcN4mabRzf2ebLJN9eKdmnmkJAGY4NEMos+NT2+ Ka/OszjBJBvCZ10gTUOYiB/xUNawAdp66DSHh8gLvHm2nLwrmbt05gLdQKjf/v/Gd3mj/0 xuhsRfr81jhzH/DyR/Bk5LCFQwwvTYoTsClyGFbkrYcqxOh6x9ZhKwMLNjd8/daQdub+z5 3dhooS3Eozi3rJy/83pcENRKKBddOq3OWg4inXvxJmPbWKIVOq393uYuMew6/zZWwPMRiW Zaluq9v8gc0qYKm7h6OdfbfdsQFtOXZhHigaSG5Jb0W9e9nMgo9aApyBJGmStw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=r4Z+L59O; 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.01 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=r4Z+L59O; 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: E100E2BBF9 X-Spam-Score: 3.01 X-Migadu-Scanner: scn0.migadu.com X-TUID: tOS+tzjYDNfD %build-inputs and friends don't exist when cross-compiling, so use some G-expology instead. * gnu/packages/freedesktop.scm (elogind)[arguments]<#:configure-flags>: Don't use '%outputs' or '%build-inputs' when cross-compiling. --- gnu/packages/freedesktop.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e0f5623805..0f6bb72a1f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -580,12 +580,20 @@ the freedesktop.org XDG Base Directory specification.") (build-system meson-build-system) (arguments `(#:configure-flags - ,#~(let* ((out (assoc-ref %outputs "out")) + ;; TODO(core-updates): Use #$output unconditionally. + ,#~(let* ((out #$(if (%current-target-system) + #~#$output + #~(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")) + ;; 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"))) (halt-path (string-append shepherd "/sbin/halt")) (kexec-path "") ;not available in Guix yet (nologin-path (string-append shadow "/sbin/nologin")) -- 2.33.0