guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/16: system: vm: Fix for cross-build to the Hurd.


From: guix-commits
Subject: 04/16: system: vm: Fix for cross-build to the Hurd.
Date: Thu, 14 May 2020 17:32:08 -0400 (EDT)

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit 30074b6e2348bbbf84eb998d1061c03e6dc34443
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
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 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 163e8b4..eba3376 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
 ;;; Copyright © 2017 Marius Bakke <address@hidden>
 ;;; Copyright © 2018 Chris Marusich <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -222,10 +223,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)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]