diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 834fdc55..bb270724 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,7 +36,8 @@ jobs:
       - name: Update Packages
         run: sudo apt update
       - name: Install Packages
-        run: sudo apt install -y xorg-dev libxcb-glx0-dev libxkbcommon-dev libxcb-xkb-dev libfuse2 libcurl4-openssl-dev libssl-dev
+        run: >
+          sudo apt install -y xorg-dev libxcb-glx0-dev libxkbcommon-dev libxkbcommon-x11-dev libxcb-xkb-dev libfuse2 libcurl4-openssl-dev libssl-dev
       - name: Checkout
         uses: actions/checkout@v3
         with:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94958259..6e4e7f6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,7 @@ if(NOT ANDROID AND LOVR_BUILD_SHARED)
 endif()
 
 # GLFW
-if(LOVR_USE_GLFW AND NOT (EMSCRIPTEN OR ANDROID))
+if(LOVR_USE_GLFW AND NOT (EMSCRIPTEN OR ANDROID OR (UNIX AND NOT APPLE)))
   if(LOVR_SYSTEM_GLFW)
     pkg_search_module(GLFW REQUIRED glfw3)
     include_directories(${GLFW_INCLUDE_DIRS})
@@ -882,7 +882,7 @@ elseif(ANDROID)
   endif()
 elseif(UNIX)
   target_sources(lovr PRIVATE src/core/os_linux.c)
-  target_link_libraries(lovr X11 xcb X11-xcb)
+  target_link_libraries(lovr xcb xcb-xkb xkbcommon xkbcommon-x11)
   set_target_properties(lovr PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
     BUILD_WITH_INSTALL_RPATH TRUE