From patchwork Mon Mar 18 18:39:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: dan X-Patchwork-Id: 61926 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 1DA0827BBEB; Mon, 18 Mar 2024 19:46:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0BF7C27BBE2 for ; Mon, 18 Mar 2024 19:46:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmIvg-0007mU-Op; Mon, 18 Mar 2024 15:45:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmIvG-0007hM-Bd for guix-patches@gnu.org; Mon, 18 Mar 2024 15:45:30 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rmIvE-0003B8-Ro for guix-patches@gnu.org; Mon, 18 Mar 2024 15:45:26 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rmIvr-0004Ea-39 for guix-patches@gnu.org; Mon, 18 Mar 2024 15:46:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69876] [PATCH] gnu: greetd: Fix cross-compilation. Resent-From: dan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Mar 2024 19:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69876 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69876@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171079116016246 (code B ref -1); Mon, 18 Mar 2024 19:46:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Mar 2024 19:46:00 +0000 Received: from localhost ([127.0.0.1]:40305 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rmIvl-0004Dw-09 for submit@debbugs.gnu.org; Mon, 18 Mar 2024 15:46:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:45302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rmIve-0004CN-2T for submit@debbugs.gnu.org; Mon, 18 Mar 2024 15:45:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmHtK-00008R-Rs for guix-patches@gnu.org; Mon, 18 Mar 2024 14:39:22 -0400 Received: from fhigh2-smtp.messagingengine.com ([103.168.172.153]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmHtJ-0006hT-3u for guix-patches@gnu.org; Mon, 18 Mar 2024 14:39:22 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 39E211140116 for ; Mon, 18 Mar 2024 14:39:20 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Mon, 18 Mar 2024 14:39:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm3; t=1710787160; x=1710873560; bh=rHxDw0Kupv 16okINYZdvam4tnXFAjorgk2iU/abEzuQ=; b=PCSbRNduJMlQSyupUP0cDgC84f qOo0y3c+hALnuRG2oE8fVhNqUwAmsE5D5zPrhFcMLCbtteylXYEyqt8MvEpSMfif P884y00LG5pLGMxWmOOUJbhLFPkjZK2B+ALMiY7wB/kWSFjrIklT+cS3ueks9JpR G9hmgRk5m9h+CBnl/FnhEwWSc76Bkxg1dca7peCco9lb1+75ZoyhaajR34muAOzt 32xkW9B1y3Zy0vcY6faS3LC3iZ73o2LDuyqq7PyfsDRRTLf+gR2dY7i4zDN8aZcC aMTzWppuZayzp8VIbu/OF5qBN5kb/V1z8pff5Ofe2+TBMi8zkoX5+Qwj6H3A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1710787160; x=1710873560; bh=rHxDw0Kupv16okINYZdvam4tnXFA jorgk2iU/abEzuQ=; b=IHXDcDI+tOx3fLvTV+DlfWt6vlTNtxgq4k2L6c0nEWGD VO+2O8F+nIa6rBUQjOb9o4056ZNcsYZ6Eaz+rxkT6VmqcTsiMH8oTXID2U+Gkt6c xpEX/eaF96MuQKNw/CoL1Wl2+IK30st57mQG5N37R1GBpOBir2Pk3oIw71oXjLfM BSkUHjSVuTGELcRXhXLPfsKo8h/drL8tY/oO9JfxBEakG7i9ffwvZyy01+jzKoDo bwI29TlA1mcVVYoaJRMJ3g5mBn9o9lI9ubTEahS85hMdPeww5vPEIdRAvz1NCBsX liXZtfuS90JesM8tWSHHP5Ryig3i6BoRQ7Z4JjZC6w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrkeejgdduudehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofggtgfgsehtkeertd ertdejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepgeejhefggffggfeiheekvdekveetgfejteefuddtfeevtdetuddtfeehhefhtd ehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihes uggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 18 Mar 2024 14:39:18 -0400 (EDT) From: dan Date: Tue, 19 Mar 2024 02:39:07 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=103.168.172.153; envelope-from=i@dan.games; helo=fhigh2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/admin.scm (greetd): Fix cross-compilation. [inputs][native-inputs]: Move linux-pam from native-inputs to inputs. [arguments]<#:phases>: Set release directory based on target. Change-Id: I822f8f215677bc951b21e46dddf44954a43df58f --- gnu/packages/admin.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) base-commit: c8556379c3f2d3d095a178858915720f2eebc012 diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2b94b1e17a..a4cd17ea33 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -64,6 +64,7 @@ ;;; Copyright © 2023 Jaeme Sifat ;;; Copyright © 2023 Nicolas Graves ;;; Copyright © 2023 Tomás Ortín Fernández +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -99,6 +100,7 @@ (define-module (gnu packages admin) #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix platform) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages acl) @@ -5462,7 +5464,16 @@ (define-public greetd (man1 (string-append man "/man1")) (man5 (string-append man "/man5")) (man7 (string-append man "/man7")) - (release "target/release") + (release ,(if (or (%current-target-system) + (%current-system)) + (string-append + "target/" + (platform-rust-target + (lookup-platform-by-target-or-system + (or (%current-target-system) + (%current-system)))) + "/release") + "target/release")) (greetd-bin (string-append release "/greetd")) (agreety-bin (string-append release "/agreety"))) (install-file greetd-bin sbin) @@ -5472,8 +5483,10 @@ (define-public greetd (install-file "greetd.5" man5) (install-file "greetd-ipc.7" man7) (install-file "agreety.1" man1)))))))) + (inputs + (list linux-pam)) (native-inputs - (list linux-pam scdoc)) + (list scdoc)) (synopsis "Minimal and flexible login manager daemon") (description "greetd is a minimal and flexible login manager daemon