From ddffc370ef0c4c0ba57a5e45badf019e6f3b6cbf Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 19 Mar 2024 02:39:07 +0800 Subject: [PATCH] gnu: greetd: Fix cross-compilation. * gnu/packages/admin.scm (greetd): Fix cross-compilation. [native-inputs]: Move linux-pam from here ... [inputs]: ... to here. [arguments]<#:phases>: Set release directory based on target. Change-Id: I822f8f215677bc951b21e46dddf44954a43df58f Signed-off-by: Efraim Flashner --- gnu/packages/admin.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1a48326059..305b26aa5e 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 @@ #: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,14 @@ it won't take longer to install 15 machines than it would to install just 2.") (man1 (string-append man "/man1")) (man5 (string-append man "/man5")) (man7 (string-append man "/man7")) - (release "target/release") + (release ,(if (%current-target-system) + (string-append + "target/" + (platform-rust-target + (lookup-platform-by-target + (%current-target-system))) + "/release") + "target/release")) (greetd-bin (string-append release "/greetd")) (agreety-bin (string-append release "/agreety"))) (install-file greetd-bin sbin) @@ -5472,8 +5481,10 @@ it won't take longer to install 15 machines than it would to install just 2.") (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