janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit eba8c84cd185bc6e2ae83a4aa29d783384dd2042
Author: Jan (janneke) Nieuwenhuizen <[email protected]>
AuthorDate: Sat May 2 19:17:34 2020 +0200
system: vm: Fix for cross-build to the Hurd.
Using #$linux when cross-building to the Hurd will attempt to cross compile
the Linux kernel, which fails. This very cheap fix (only 3 $$$ exchanged
with +) might have avoided trying many failed workarounds, or
<civodul> "money for nothing, changed to plus"
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Use native linux,
initrd. Fixes cross-build to the Hurd.
---
gnu/system/vm.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index e7e2e6b..524121c 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2017 Mathieu Othacehe <[email protected]>
;;; Copyright © 2017 Marius Bakke <[email protected]>
;;; Copyright © 2018 Chris Marusich <[email protected]>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -227,10 +228,10 @@ substitutable."
(let* ((native-inputs
'#+(list qemu (canonical-package coreutils)))
- (linux (string-append #$linux "/"
- #$(system-linux-image-file-name)))
- (initrd #$initrd)
- (loader #$loader)
+ (linux (string-append #+linux "/"
+ #+(system-linux-image-file-name)))
+ (initrd #+initrd)
+ (loader #+loader)
(graphs '#$(match references-graphs
(((graph-files . _) ...) graph-files)
(_ #f)))
@@ -350,7 +351,7 @@ system that is passed to 'populate-root-file-system'."
(setlocale LC_ALL "en_US.utf8")
(let ((inputs
- '#$(append (list parted e2fsprogs dosfstools)
+ '#+(append (list parted e2fsprogs dosfstools)
(map canonical-package
(list sed grep coreutils findutils gawk))))
