diff --git a/Tools/Scripts/generate-bundle b/Tools/Scripts/generate-bundle
index ac18c6a19ebb..fe0fdbc361ee 100755
--- a/Tools/Scripts/generate-bundle
+++ b/Tools/Scripts/generate-bundle
@@ -484,7 +484,11 @@ class BundleCreator(object):
     def _get_mesa_libraries(self):
         mesa_library_names = ['libglapi', 'libEGL', 'libGL', 'libGLESv2', 'libGLX', 'libdrm', 'libgbm', 'libMesaOpenCL']
         mesa_libraries = []
-        lib_dir_dri = self._get_pkg_config_var('dri', 'libdir')
+        try:
+            lib_dir_dri = self._get_pkg_config_var('dri', 'libdir')
+        except RuntimeError:
+            lib_dir_dri = os.path.dirname(self._get_pkg_config_var('dri', 'dridriverdir'))
+
         # Some versions of the flatpak SDK ship the Mesa libraries into a non-standard path.
         candidate_lib_dirs = [ lib_dir_dri, os.path.join(lib_dir_dri, 'GL/default/lib') ]
         for lib_dir in candidate_lib_dirs:
diff --git a/Tools/glib/dependencies/apt b/Tools/glib/dependencies/apt
index 4c2cca7f30f8..77b192427f14 100644
--- a/Tools/glib/dependencies/apt
+++ b/Tools/glib/dependencies/apt
@@ -70,6 +70,7 @@ PACKAGES=(
     $(aptIfExists libwpebackend-fdo-1.0-dev)
     libxml2-utils
     libxslt1-dev
+    mesa-common-dev
     ninja-build
     patch
     ruby