From 7233bfd984b61e54d4a86a0391fd15eebbe286f2 Mon Sep 17 00:00:00 2001
From: Quinn Unger <quinn.unger@pm.me>
Date: Thu, 8 Oct 2026 15:44:26 +0100
Subject: [PATCH] vivado: enable "Vitis Embedded Development"

---
 pkgs/vivado/vivado-unwrapped.nix | 27 ++++++++++++---------------
 pkgs/vivado/vivado.nix           |  2 ++
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/pkgs/vivado/vivado-unwrapped.nix b/pkgs/vivado/vivado-unwrapped.nix
index 2f91aa6..23730d9 100644
--- a/pkgs/vivado/vivado-unwrapped.nix
+++ b/pkgs/vivado/vivado-unwrapped.nix
@@ -22,6 +22,8 @@
     # "Virtex UltraScale+ FPGAs"
     # "Virtex UltraScale+ 58G FPGAs"
     # "Virtex UltraScale+ HBM FPGAs"
+    # "Install Devices for Kria SOMs and Starter Kits"
+    # "Install devices for Alveo and edge acceleration platforms"
   ],
   extraConfig ? { },
   installerConfigFile ? null,
@@ -47,17 +49,23 @@ let
   config = lib.recursiveUpdate {
     Edition = "Vivado Design Suite";
     Product = "Vivado";
+    Destination = ""; # We override this in the installPhase
+    InstallOptions."Acquire or Manage a License Key" = false; # Requires interaction
+    CreateProgramGroupShortcuts = true;
+    ProgramGroupFolder = "AMD Adaptive SoC and FPGA Tools";
+    CreateFileAssociation = true;
+    CreateDesktopShortcuts = false;
     Modules = {
       DocNav = true;
-      "Install Devices for Kria SOMs and Starter Kits" = false;
-      "Install devices for Alveo and edge acceleration platforms" = false;
       "Power Design Manager (PDM)" = true;
+      "Vitis Embedded Development" = true;
 
-      # Vitis
-      "Vitis Embedded Development" = false;
       "Vitis Model Composer(A toolbox for Simulink)" = false;
       "Vitis Networking P4" = false;
 
+      "Install Devices for Kria SOMs and Starter Kits" = false;
+      "Install devices for Alveo and edge acceleration platforms" = false;
+
       # Artix
       "Artix-7 FPGAs" = false;
       "Artix UltraScale+ FPGAs" = false;
@@ -89,17 +97,6 @@ let
         value = true;
       }) supportedDevices
     ));
-    Destination = "";
-    # Choose the post install scripts you'd like to run as part of the finalization step. Please note that some of these scripts may require user interaction during runtime.
-    InstallOptions."Acquire or Manage a License Key" = false;
-    # Choose whether Start menu/Application menu shortcuts will be created or not.
-    CreateProgramGroupShortcuts = true;
-    # Choose the name of the Start menu/Application menu shortcut. This setting will be ignored if you choose NOT to create shortcuts.
-    ProgramGroupFolder = "AMD Adaptive SoC and FPGA Tools";
-    # Choose whether file associations will be created or not.
-    CreateFileAssociation = true;
-    # Choose whether shortcuts will be created on the desktop or not.
-    CreateDesktopShortcuts = false;
   } extraConfig;
 
   configFile =
diff --git a/pkgs/vivado/vivado.nix b/pkgs/vivado/vivado.nix
index 469cb0b..c5125db 100644
--- a/pkgs/vivado/vivado.nix
+++ b/pkgs/vivado/vivado.nix
@@ -40,6 +40,8 @@
     # "Virtex UltraScale+ FPGAs"
     # "Virtex UltraScale+ 58G FPGAs"
     # "Virtex UltraScale+ HBM FPGAs"
+    # "Install Devices for Kria SOMs and Starter Kits"
+    # "Install devices for Alveo and edge acceleration platforms"
   ],
   extraConfig ? { }, # See defaultConfig in vivado-unwrapped.nix for example usage.
   installerConfigFile ? null, # optionally, use the path to your install_config.txt
-- 
2.51.2