qemu-static: re-add dtc buildInput

edgelesssys · Nov 4, 2024 · a84f6f9 · a84f6f9
1 parent 86fb203
commit a84f6f9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/packages/by-name/qemu-static/package.nix b/packages/by-name/qemu-static/package.nix
@@ -21,6 +21,11 @@
       "-Dlinux_fdt_path=${dtc}/lib"
     ];
 
+    # The upstream derivation removes the dtc dependency when minimal is set,
+    # but QEMU needs it when not only building usermode emulators.
+    # TODO(freax13): Fix this upstream.
+    buildInputs = previousAttrs.buildInputs ++ [ dtc ];
+
     nativeBuildInputs = previousAttrs.nativeBuildInputs ++ [ python3Packages.packaging ];
 
     patches = [

diff --git a/packages/by-name/qemu-tdx-static/package.nix b/packages/by-name/qemu-tdx-static/package.nix
@@ -36,6 +36,11 @@ in
       "-Dlinux_fdt_path=${dtc}/lib"
     ];
 
+    # The upstream derivation removes the dtc dependency when minimal is set,
+    # but QEMU needs it when not only building usermode emulators.
+    # TODO(freax13): Fix this upstream.
+    buildInputs = previousAttrs.buildInputs ++ [ dtc ];
+
     nativeBuildInputs = previousAttrs.nativeBuildInputs ++ [ python3Packages.packaging ];
 
     prePatch = ''