[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#69876] [PATCH] gnu: greetd: Fix cross-compilation.
From: |
dan |
Subject: |
[bug#69876] [PATCH] gnu: greetd: Fix cross-compilation. |
Date: |
Tue, 19 Mar 2024 02:39:07 +0800 |
* 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(-)
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 <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 @@ (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
base-commit: c8556379c3f2d3d095a178858915720f2eebc012
--
2.41.0
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [bug#69876] [PATCH] gnu: greetd: Fix cross-compilation.,
dan <=