[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/10: gnu: gnumach: Fix compilation.
From: |
guix-commits |
Subject: |
01/10: gnu: gnumach: Fix compilation. |
Date: |
Fri, 3 Apr 2020 17:15:22 -0400 (EDT) |
civodul pushed a commit to branch wip-hurd-vm
in repository guix.
commit a991ee6387731885b9540e1a6cf12ae7c87c12c6
Author: Ludovic Courtès <address@hidden>
AuthorDate: Tue Mar 31 23:44:25 2020 +0200
gnu: gnumach: Fix compilation.
* gnu/packages/hurd.scm (gnumach)[arguments]: Inherit arguments from
GNUMACH-HEADERS.
[native-inputs]: Add AUTOCONF, AUTOMAKE, and TEXINFO-4.
---
gnu/packages/hurd.scm | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index b2a53b5..f94d4fa 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016, 2017 Manolis Fragkiskos Ragkousis
<address@hidden>
-;;; Copyright © 2018 Ludovic Courtès <address@hidden>
+;;; Copyright © 2018, 2020 Ludovic Courtès <address@hidden>
;;; Copyright © 2020 Efraim Flashner <address@hidden>
;;; Copyright © 2020 Marius Bakke <address@hidden>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
@@ -263,17 +263,22 @@ Hurd-minimal package which are needed for both glibc and
GCC.")
(inherit gnumach-headers)
(name "gnumach")
(arguments
- `(#:phases (modify-phases %standard-phases
- (add-after 'install 'produce-image
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (boot (string-append out "/boot")))
- (invoke "make" "gnumach.gz")
- (install-file "gnumach.gz" boot)
- #t))))))
+ (substitute-keyword-arguments (package-arguments gnumach-headers)
+ ((#:phases phases '%standard-phases)
+ `(modify-phases %standard-phases
+ (add-after 'install 'produce-image
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (boot (string-append out "/boot")))
+ (invoke "make" "gnumach.gz")
+ (install-file "gnumach.gz" boot)
+ #t)))))))
(native-inputs
`(("mig" ,mig)
- ("perl" ,perl)))
+ ("perl" ,perl)
+ ("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("texinfo" ,texinfo-4)))
(supported-systems (cons "i686-linux" %hurd-systems))
(synopsis "Microkernel of the GNU system")
(description
- branch wip-hurd-vm created (now ac209c7), guix-commits, 2020/04/03
- 03/10: vm: 'qemu-image' accepts a list of extra populate directives., guix-commits, 2020/04/03
- 05/10: gnu: gnumach: Enable kernel debugger (kbd)., guix-commits, 2020/04/03
- 02/10: install: 'populate-root-file-system' can be passed extra directives., guix-commits, 2020/04/03
- 04/10: vm: 'qemu-image' can pass options to the 'mkfs' command., guix-commits, 2020/04/03
- 01/10: gnu: gnumach: Fix compilation.,
guix-commits <=
- 10/10: gnu: hurd: Record the right file name of 'login'., guix-commits, 2020/04/03
- 06/10: DRAFT: gnu: hurd: Provide our own /libexec/rc script., guix-commits, 2020/04/03
- 07/10: gnu: cross-libc: Add patch to add 'mach_print' symbol on GNU/Hurd., guix-commits, 2020/04/03
- 08/10: gnu: hurd: Use a 32-bit MiG when cross-compiling., guix-commits, 2020/04/03
- 09/10: DRAFT: Add (gnu system hurd)., guix-commits, 2020/04/03