Remove xcompile overlay for qemu

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
tiiuae · May 24, 2024 · d96acef · d96acef
1 parent 3365a6d
commit d96acef
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 18 deletions.
diff --git a/modules/jetpack/nvidia-jetson-orin/virtualization/host/bpmp-virt-host/default.nix b/modules/jetpack/nvidia-jetson-orin/virtualization/host/bpmp-virt-host/default.nix
@@ -44,7 +44,7 @@ in {
 
     # TODO: Consider are these really needed, maybe add only in debug builds?
     environment.systemPackages = with pkgs; [
-      qemu
+      qemu_kvm
       dtc
     ];
   };

diff --git a/...s/jetpack/nvidia-jetson-orin/virtualization/host/bpmp-virt-host/overlays/qemu/default.nix b/...s/jetpack/nvidia-jetson-orin/virtualization/host/bpmp-virt-host/overlays/qemu/default.nix
@@ -1,7 +1,7 @@
 # Copyright 2022-2023 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 (_final: prev: {
-  qemu = prev.qemu.overrideAttrs (_final: prev: {
+  qemu_kvm = prev.qemu_kvm.overrideAttrs (_final: prev: {
     patches =
       prev.patches
       ++ [

diff --git a/overlays/cross-compilation/default.nix b/overlays/cross-compilation/default.nix
@@ -8,6 +8,4 @@
   edk2 = import ./edk2 {inherit final prev;};
   jbig2dec = import ./jbig2dec {inherit prev;};
   pipewire = import ./pipewire {inherit prev;};
-
-  qemu = import ./qemu {inherit prev;};
 })
diff --git a/overlays/cross-compilation/qemu/default.nix b/overlays/cross-compilation/qemu/default.nix
diff --git a/packages/windows-launcher/default.nix b/packages/windows-launcher/default.nix
@@ -4,7 +4,7 @@
   stdenvNoCC,
   lib,
   stdenv,
-  qemu,
+  qemu_kvm,
   OVMF,
   yad,
   writeShellScript,
@@ -57,7 +57,7 @@
           ISO_FILE=$1
           IMG_FILE="$IMG_DIR/win11.qcow2"
           if [ ! -f $IMG_FILE ]; then
-            ${qemu}/bin/qemu-img create -f qcow2 $IMG_FILE 64G
+            ${qemu_kvm}/bin/qemu-img create -f qcow2 $IMG_FILE 64G
           fi
         fi
       ''
@@ -108,7 +108,7 @@
         fi
       ''
       + ''
-        eval "${qemu}/bin/qemu_kvm ''${QEMU_PARAMS[@]} ''${@:2}"
+        eval "${qemu_kvm}/bin/qemu_kvm ''${QEMU_PARAMS[@]} ''${@:2}"
       '');
   windowsLauncherUI =
     writeShellScript
@@ -150,7 +150,7 @@ in
   stdenvNoCC.mkDerivation {
     name = "windows-launcher";
 
-    buildInputs = [yad qemu OVMF];
+    buildInputs = [yad qemu_kvm OVMF];
 
     phases = ["installPhase"];
 
@@ -160,7 +160,7 @@ in
       cp ${windowsLauncherUI} $out/bin/windows-launcher-ui
     '';
 
-    meta = with lib; {
+    meta = {
       description = "Helper scripts for launching Windows virtual machines using QEMU";
       platforms = [
         "x86_64-linux"