diff options
| author | Efraim Flashner <[email protected]> | 2022-10-12 14:33:56 +0300 |
|---|---|---|
| committer | Efraim Flashner <[email protected]> | 2022-10-12 14:36:44 +0300 |
| commit | 322917aeb8e672c21378fd371a5cff4a9f0c2520 (patch) | |
| tree | 70229faa39f14caa09b769153453c3898f64f7fc /gnu/packages/libdaemon.scm | |
| parent | 407f017663c97ebfe48e3cb304bf97bf2557f83f (diff) | |
| parent | e1baf802ccd8af4f7b416b0987db706f2dbfc42f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts:
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/kde-frameworks.scm
gnu/packages/video.scm
Diffstat (limited to 'gnu/packages/libdaemon.scm')
| -rw-r--r-- | gnu/packages/libdaemon.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/packages/libdaemon.scm b/gnu/packages/libdaemon.scm index 9dc851e823..12e4e2dc9c 100644 --- a/gnu/packages/libdaemon.scm +++ b/gnu/packages/libdaemon.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2020 Ludovic Courtès <[email protected]> ;;; Copyright © 2021 Maxime Devos <[email protected]> +;;; Copyright © 2022 LuHui <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,7 +50,8 @@ (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (native-inputs - (if (and=> (%current-target-system) target-aarch64?) + (if (or (and=> (%current-target-system) target-aarch64?) + (and=> (%current-target-system) target-riscv64?)) `(("config" ,config)) ; for config.sub '())) (arguments @@ -66,7 +68,8 @@ ;; Hurd's console client. "--localstatedir=/var")) '()) - ,@(if (and=> (%current-target-system) target-aarch64?) + ,@(if (or (and=> (%current-target-system) target-aarch64?) + (and=> (%current-target-system) target-riscv64?)) `(#:phases (modify-phases %standard-phases (add-before 'configure 'update-config.sub |