diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba29e817b3..7f192887f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,10 +32,20 @@ endif()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
+
+# NB: this does not account for SPARC
+# If you get Eden working on SPARC, please shoot crueter@crueter.xyz multiple emails
+# and you will be hailed for eternity
 if (PLATFORM_SUN)
     # Terrific Solaris pkg shenanigans
     list(APPEND CMAKE_PREFIX_PATH "/usr/lib/qt/6.6/lib/amd64/cmake")
     list(APPEND CMAKE_MODULE_PATH "/usr/lib/qt/6.6/lib/amd64/cmake")
+
+    # amazing
+    # absolutely incredible
+    list(APPEND CMAKE_PREFIX_PATH "/usr/lib/amd64/cmake")
+    list(APPEND CMAKE_MODULE_PATH "/usr/lib/amd64/cmake")
+
     # For some mighty reason, doing a normal release build sometimes may not trigger
     # the proper -O3 switch to materialize
     if (CMAKE_BUILD_TYPE MATCHES "Release")
@@ -429,6 +439,9 @@ if (YUZU_USE_CPM)
         endif()
     endif()
 
+    # fmt
+    AddJsonPackage(fmt)
+
     # lz4
     AddJsonPackage(lz4)
 
@@ -470,6 +483,8 @@ if (YUZU_USE_CPM)
     endif()
 else()
     # Enforce the search mode of non-required packages for better and shorter failure messages
+    find_package(fmt 8 REQUIRED)
+
     if (NOT YUZU_DISABLE_LLVM)
         find_package(LLVM MODULE COMPONENTS Demangle)
     endif()
@@ -539,7 +554,6 @@ find_package(VulkanUtilityLibraries)
 find_package(SimpleIni)
 find_package(SPIRV-Tools)
 find_package(sirit)
-find_package(fmt)
 
 if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
     find_package(xbyak)
diff --git a/cpmfile.json b/cpmfile.json
index 957039c371..e9e53ed326 100644
--- a/cpmfile.json
+++ b/cpmfile.json
@@ -25,6 +25,13 @@
             "0003-armasm-options.patch"
         ]
     },
+    "fmt": {
+        "repo": "fmtlib/fmt",
+        "tag": "%VERSION%",
+        "hash": "c4ab814c20fbad7e3f0ae169125a4988a2795631194703251481dc36b18da65c886c4faa9acd046b0a295005217b3689eb0126108a9ba5aac2ca909aae263c2f",
+        "version": "8",
+        "git_version": "12.0.0"
+    },
     "lz4": {
         "name": "lz4",
         "repo": "lz4/lz4",
diff --git a/docs/Deps.md b/docs/Deps.md
index 69f41794ea..b8a1be66d2 100644
--- a/docs/Deps.md
+++ b/docs/Deps.md
@@ -195,7 +195,7 @@ Run the usual update + install of essential toolings: `sudo pkg update && sudo p
 - **gcc**: `sudo pkg install developer/gcc-14`.
 - **clang**: Version 20 is broken, use `sudo pkg install developer/clang-19`.
 
-Then install the libraries: `sudo pkg install qt6 boost glslang libzip library/lz4 nlohmann-json openssl opus sdl2 zlib compress/zstd unzip pkg-config nasm autoconf mesa library/libdrm header-drm developer/fmt`.
+Then install the libraries: `sudo pkg install qt6 boost glslang libzip library/lz4 libusb-1 nlohmann-json openssl opus sdl2 zlib compress/zstd unzip pkg-config nasm autoconf mesa library/libdrm header-drm developer/fmt`.
 </details>
 
 <details>
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index eb9a418ae8..434e6fb100 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -39,9 +39,6 @@ if (ARCHITECTURE_arm64 OR DYNARMIC_TESTS)
     AddJsonPackage(oaknut)
 endif()
 
-# fmt
-AddJsonPackage(fmt)
-
 # enet
 AddJsonPackage(enet)
 
diff --git a/externals/cpmfile.json b/externals/cpmfile.json
index e1ca354c78..aa3a97c128 100644
--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@@ -198,12 +198,5 @@
         "key": "steamdeck",
         "bundled": true,
         "skip_updates": "true"
-    },
-    "fmt": {
-        "repo": "fmtlib/fmt",
-        "tag": "%VERSION%",
-        "hash": "c4ab814c20fbad7e3f0ae169125a4988a2795631194703251481dc36b18da65c886c4faa9acd046b0a295005217b3689eb0126108a9ba5aac2ca909aae263c2f",
-        "version": "8",
-        "git_version": "12.0.0"
     }
 }
diff --git a/externals/libusb/CMakeLists.txt b/externals/libusb/CMakeLists.txt
index 77a762d070..a53464ea98 100644
--- a/externals/libusb/CMakeLists.txt
+++ b/externals/libusb/CMakeLists.txt
@@ -6,18 +6,7 @@
 
 include(CPMUtil)
 
-# we love our libraries don't we folks
-if (PLATFORM_SUN)
-    set(libusb_bundled ON)
-else()
-    set(libusb_bundled OFF)
-endif()
-
-# TODO(crueter): Fix on Solaris
-AddJsonPackage(
-    NAME libusb
-    BUNDLED_PACKAGE ${libusb_bundled}
-)
+AddJsonPackage(libusb)
 
 if (NOT libusb_ADDED)
     return()