From 4664110a34fdb22f6019dac52d42d6f8636ae2a7 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 17 Dec 2025 18:30:11 -0800
Subject: [PATCH] vmTools: refactor in a baseRHELFamilyPackages

---
 pkgs/build-support/vm/default.nix | 86 +++++++++----------------------
 1 file changed, 24 insertions(+), 62 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 67a2ecc2c7cc..6c3e6ac21bc4 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1310,76 +1310,39 @@ let
     };
   };
 
-  # Common packages for Fedora images.
-  commonFedoraPackages = [
+  # Base packages for all RHEL-family distros (Fedora, CentOS Stream, Rocky, Alma, etc.)
+  baseRHELFamilyPackages = [
+    "autoconf"
+    "automake"
+    "basesystem"
+    "bzip2"
+    "curl"
+    "diffutils"
+    "findutils"
+    "gawk"
+    "gcc-c++"
+    "glibc-gconv-extra"
+    "gzip"
+    "make"
+    "patch"
+    "perl"
+    "rpm"
+    "rpm-build"
+    "tar"
+    "unzip"
+  ];
+
+  commonFedoraPackages = baseRHELFamilyPackages ++ [
     "annobin-plugin-gcc"
-    "autoconf"
-    "automake"
-    "basesystem"
-    "bzip2"
-    "curl"
-    "diffutils"
     "fedora-release"
-    "findutils"
-    "gawk"
-    "gcc-c++"
     "gcc-plugin-annobin"
-    "glibc-gconv-extra"
-    "gzip"
-    "make"
-    "patch"
-    "perl"
     "pkgconf-pkg-config"
-    "rpm"
-    "rpm-build"
-    "tar"
-    "unzip"
   ];
 
-  commonCentOSStreamPackages = [
-    "autoconf"
-    "automake"
-    "basesystem"
-    "bzip2"
+  commonCentOSStreamPackages = baseRHELFamilyPackages ++ [
     "centos-stream-release"
-    "curl"
-    "diffutils"
-    "findutils"
-    "gawk"
-    "gcc-c++"
     "gcc-plugin-annobin"
-    "glibc-gconv-extra"
-    "gzip"
-    "make"
-    "patch"
-    "perl"
     "pkgconf"
-    "rpm"
-    "rpm-build"
-    "tar"
-    "unzip"
-  ];
-
-  commonRHELPackages = [
-    "autoconf"
-    "automake"
-    "basesystem"
-    "bzip2"
-    "curl"
-    "diffutils"
-    "findutils"
-    "gawk"
-    "gcc-c++"
-    "gzip"
-    "make"
-    "patch"
-    "perl"
-    "pkgconfig"
-    "procps-ng"
-    "rpm"
-    "rpm-build"
-    "tar"
-    "unzip"
   ];
 
   # Common packages for openSUSE images.
@@ -1485,7 +1448,6 @@ in
     commonDebianPackages
     commonFedoraPackages
     commonOpenSUSEPackages
-    commonRHELPackages
     createEmptyImage
     debClosureGenerator
     debDistros