fixup! pick seabios changes from NixOS#341429

CertainLach · Sep 30, 2024 · 4d5b1f5 · 4d5b1f5
1 parent 5e6f44b
commit 4d5b1f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkgs/applications/virtualization/xen/generic/default.nix b/pkgs/applications/virtualization/xen/generic/default.nix
@@ -392,7 +392,7 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.lists.optional (!withInternalQEMU) "--with-system-qemu"
 
-    ++ lib.lists.optional withSeaBIOS "--with-system-seabios=${seabios}/share/seabios"
+    ++ lib.lists.optional withSeaBIOS "--with-system-seabios=${seabios.firmware}"
     ++ lib.lists.optional (!withInternalSeaBIOS && !withSeaBIOS) "--disable-seabios"
 
     ++ lib.lists.optional withOVMF "--with-system-ovmf=${OVMF.firmware}"

diff --git a/pkgs/by-name/qu/qubes-seabios/package.nix b/pkgs/by-name/qu/qubes-seabios/package.nix
@@ -56,7 +56,7 @@ let
   seavgabioses = concatStringsSep "," (map mkVgaBios ["bochs-display" "cirrus" "isavga" "qxl" "stdvga" "ramfb" "vmware" "virtio" "ati"]);
 
 in
-stdenvNoCC.mkDerivation {
+stdenvNoCC.mkDerivation (finalAttrs: {
   name = "qubes-seabios";
   inherit version;
   unpackPhase = "true";
@@ -65,4 +65,6 @@ stdenvNoCC.mkDerivation {
     cp {${seabioses}}/*.bin $out/share/seabios
     cp {${seavgabioses}}/*.bin $out/share/seavgabios
   '';
-}
+
+  passthru.firmware = "${finalAttrs.finalPackage}/share/seabios/bios-256k.bin";
+})