diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 1039e96e..16f2c84a 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -15,7 +15,7 @@ set_property(DIRECTORY
              units.cmake
              qt6ct.cmake)
 
-include(aws-sdk-cpp.cmake)
+find_package(AWSSDK CONFIG REQUIRED)
 include(date.cmake)
 include(glad.cmake)
 include(hsluv-c.cmake)
diff --git a/external/stb.cmake b/external/stb.cmake
index 570af425..f2e7b2c8 100644
--- a/external/stb.cmake
+++ b/external/stb.cmake
@@ -1,4 +1,4 @@
 cmake_minimum_required(VERSION 3.24)
 set(PROJECT_NAME scwx-stb)
 
-set(STB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/stb PARENT_SCOPE)
+# Nix: set STB_INCLUDE_DIR in cmake flags
diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
index f73d70da..ed40e428 100644
--- a/scwx-qt/scwx-qt.cmake
+++ b/scwx-qt/scwx-qt.cmake
@@ -13,13 +13,14 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 OPTION(SCWX_DISABLE_CONSOLE "Disables the Windows console in release mode" ON)
 
-find_package(Boost)
+find_package(Boost REQUIRED COMPONENTS json timer atomic program_options)
 find_package(Fontconfig)
-find_package(geographiclib)
+find_package(GeographicLib)
 find_package(geos)
 find_package(glm)
 find_package(JPEG)
 find_package(OpenGL REQUIRED)
+find_package(PNG)
 find_package(Python COMPONENTS Interpreter)
 find_package(SQLite3)
 find_package(TIFF)
@@ -872,6 +873,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
                                      qt6ct-common
                                      qt6ct-widgets
                                      SQLite::SQLite3
+                                     PNG::PNG
                                      TIFF::TIFF
                                      wxdata)
 
diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake
index 07fe8464..0624971d 100644
--- a/wxdata/wxdata.cmake
+++ b/wxdata/wxdata.cmake
@@ -4,7 +4,8 @@ project(scwx-data)
 
 include(CheckCXXSymbolExists)
 
-find_package(Boost)
+find_package(Boost REQUIRED COMPONENTS iostreams url)
+find_package(BZip2)
 find_package(cpr)
 find_package(LibXml2)
 find_package(libzip)