2 files changed, 28 insertions, 32 deletions

diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm
index 4f75686..ba4e3b3 100644
--- a/modules/ryan-config/base-system.scm
+++ b/modules/ryan-config/base-system.scm
@@ -170,7 +170,7 @@
                    (service nix-service-type)
                    (service libvirt-service-type
                             (libvirt-configuration
-                              (libvirt libvirt-new)
+                              (libvirt libvirt-ovmf)
                               (unix-sock-group "libvirt")))
                    (service virtlog-service-type)
                    (service bluetooth-service-type)
diff --git a/modules/ryan-packages/virtualization.scm b/modules/ryan-packages/virtualization.scm
index d43a337..d59ad2e 100644
--- a/modules/ryan-packages/virtualization.scm
+++ b/modules/ryan-packages/virtualization.scm
@@ -10,40 +10,36 @@
                #:use-module (gnu packages firmware)
                #:use-module (guix gexp))
 
-(define ovmf-new
-  (package
-    (inherit ovmf)
-    (name "ovmf-new")
-    (arguments
-     (substitute-keyword-arguments (package-arguments ovmf)
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            (replace 'install
-               (lambda _
-                 (let ((fmw (string-append #$output "/share/firmware")))
-                    (mkdir-p fmw)
-                    (copy-recursively "Build/OvmfX64/RELEASE_GCC49/FV" fmw))))))))))
-
-(define-public libvirt-new
+(define-public libvirt-ovmf
   (package
     (inherit libvirt)
-    (name "libvirt-new")
+    (name "libvirt-ovmf")
     (inputs
       (modify-inputs (package-inputs libvirt)
-                     (append ovmf-new)))))
+                     (append qemu)))
+    (arguments
+      (substitute-keyword-arguments (package-arguments libvirt)
+        ((#:phases phases)
+         #~(modify-phases #$phases
+            (add-after 'install 'install-firmware
+                (lambda _
+                    (let ((fmw (string-append #$output "/share/qemu")))
+                        (mkdir-p fmw)
+                        (copy-recursively #$(file-append qemu "/share/qemu") fmw))))))))))
 
 (define-public virt-manager-ovmf
-               (package
-                 (inherit virt-manager)
-                 (name "virt-manager-ovmf")
-                 (arguments
-                   (substitute-keyword-arguments (package-arguments virt-manager)
-                    ((#:phases phases)
-                     #~(modify-phases #$phases
-                        (add-after 'install 'ovmf
-                            (lambda _
-                              (let ((fmw (string-append #$output "/usr/share/OVMF")))
-                                (mkdir-p fmw)
-                                (copy-recursively #$(file-append ovmf-new "/share/firmware") fmw)
-                                ;(mkdir-p fmw)
-                                (copy-recursively "Build/OvmfX64/RELEASE_GCC49/FV" fmw))))))))))
+    (package
+      (inherit virt-manager)
+      (name "virt-manager-ovmf")
+      (inputs
+        (modify-inputs (package-inputs virt-manager)
+                     (append qemu)))
+      (arguments
+        (substitute-keyword-arguments (package-arguments virt-manager)
+         ((#:phases phases)
+          #~(modify-phases #$phases
+             (add-after 'install 'install-firmware
+                 (lambda _
+                   (let ((fmw (string-append #$output "/share/qemu")))
+                     (mkdir-p fmw)
+                     (copy-recursively #$(file-append qemu "/share/firmware") fmw))))))))))