From 18d73578c3b1ce8438cdc40afd05002edfe35977 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Sun, 19 May 2024 00:52:06 +0200 Subject: Use inferiors for qemu-7 --- desktop.scm | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/desktop.scm b/desktop.scm index bcd12bc..5f16e6b 100644 --- a/desktop.scm +++ b/desktop.scm @@ -1,7 +1,4 @@ -;; This is an operating system configuration generated -;; by the graphical installer. (use-modules (gnu) - (qemu) ; TODO we need this but ugh => hope we could remove it (srfi srfi-1) ((gnu packages linux) #:prefix gnu-linux:) (gnu packages admin) @@ -19,6 +16,27 @@ (nongnu packages linux) (nongnu system linux-initrd)) + +;; TODO: Remove me when NlNet project ends +(use-modules (guix inferior) (guix channels) (srfi srfi-1)) +(define channels + (list + (channel + (name 'ekaitz) + (url "git://git.elenq.tech/guix-packages") + (branch "master") + (commit + "228e85fc043aa127ab0820109068def10db5861b")) + (channel + (name 'guix) + (url "https://git.savannah.gnu.org/git/guix.git") + (branch "master") + (commit + "447e9c96259e8fa15a828de9b2dd3400e2ffafe6")))) +(define inferior + (inferior-for-channels channels)) +(define qemu (first (lookup-inferior-packages inferior "qemu" "7"))) + (use-service-modules desktop networking ssh xorg) (operating-system @@ -81,6 +99,7 @@ intel-vaapi-driver xf86-input-wacom gnu-linux:ntfs-3g + qemu %base-packages)) (services (cons* (udev-rules-service 'light gnu-linux:light) -- cgit v1.2.3