[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/14: gnu: greetd: Fix cross-compilation.
From: |
guix-commits |
Subject: |
04/14: gnu: greetd: Fix cross-compilation. |
Date: |
Tue, 2 Apr 2024 14:15:56 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit ddffc370ef0c4c0ba57a5e45badf019e6f3b6cbf
Author: dan <i@dan.games>
AuthorDate: Tue Mar 19 02:39:07 2024 +0800
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>
---
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 <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
- branch master updated (7af70efd76 -> e82dc389f5), guix-commits, 2024/04/02
- 03/14: gnu: ngtcp2: Update to 1.4.0., guix-commits, 2024/04/02
- 01/14: gnu: libjxl: Fix build on riscv64-linux., guix-commits, 2024/04/02
- 07/14: gnu: pinentry-rofi: Update to 2.1.0., guix-commits, 2024/04/02
- 14/14: gnu: clojure-tools: Update to 1.11.1.1413., guix-commits, 2024/04/02
- 11/14: gnu: clifm: Update to 1.18., guix-commits, 2024/04/02
- 02/14: gnu: ccid: Fix cross-compilation., guix-commits, 2024/04/02
- 05/14: gnu: Add pureos-archive-keyring., guix-commits, 2024/04/02
- 06/14: gnu: debootstrap: Use pureos-archive-keyring., guix-commits, 2024/04/02
- 13/14: gnu: Add clojure-tools-deps., guix-commits, 2024/04/02
- 04/14: gnu: greetd: Fix cross-compilation.,
guix-commits <=
- 08/14: gnu: parallel: Update to 20240322., guix-commits, 2024/04/02
- 09/14: Revert "gnu: gtk: Skip failing tests on aarch64-linux.", guix-commits, 2024/04/02
- 12/14: gnu: icewm: Update to 3.4.7., guix-commits, 2024/04/02
- 10/14: gnu: gtk: Fix tests on aarch64., guix-commits, 2024/04/02