diff options
| author | dan <i@dan.games> | 2024-03-19 02:39:07 +0800 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2024-04-02 16:19:16 +0300 |
| commit | ddffc370ef0c4c0ba57a5e45badf019e6f3b6cbf (patch) | |
| tree | 18cd50dda4d47c6e2dee428e889b6b3ea4b75b87 | |
| parent | af67e6d70c6a242647b167048fb4945bfd91c0ee (diff) | |
| download | guix-ddffc370ef0c4c0ba57a5e45badf019e6f3b6cbf.tar guix-ddffc370ef0c4c0ba57a5e45badf019e6f3b6cbf.tar.gz | |
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 <efraim@flashner.co.il>
| -rw-r--r-- | gnu/packages/admin.scm | 15 |
1 files 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 <jaeme@runbox.com> ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr> ;;; Copyright © 2023 Tomás Ortín Fernández <tomasortin@mailbox.org> +;;; Copyright © 2024 dan <i@dan.games> ;;; ;;; 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 |