From 446cea1f1d0d317d989edddf1a7af112d76de9f3 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <nathan@mccarty.io>
Date: Wed, 8 Feb 2023 23:44:28 -0500
Subject: [PATCH] oops

---
 home-manager/linux/programs/devel.nix       |  2 +-
 packages/glfw-minecraft-wayland/default.nix | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/home-manager/linux/programs/devel.nix b/home-manager/linux/programs/devel.nix
index d193f86..ea7227a 100644
--- a/home-manager/linux/programs/devel.nix
+++ b/home-manager/linux/programs/devel.nix
@@ -30,7 +30,7 @@ with nLib; {
     # JVM Development
     (mkIf devel.jvm {
       home.packages = with unstable; [
-        jdk
+        jdk17
         gradle
         kotlin
         kotlin-native
diff --git a/packages/glfw-minecraft-wayland/default.nix b/packages/glfw-minecraft-wayland/default.nix
index bf71665..c61cb50 100644
--- a/packages/glfw-minecraft-wayland/default.nix
+++ b/packages/glfw-minecraft-wayland/default.nix
@@ -18,14 +18,25 @@ stdenv.mkDerivation rec {
     ./0007-Platform-Prefer-Wayland-over-X11.patch
   ];
 
-  propagatedBuildInputs =
-    [ libGL libX11 libXrandr libXinerama libXcursor libXi libXext ];
-  nativeBuildInputs = [ cmake extra-cmake-modules ];
-  buildInputs = [ wayland wayland-protocols libxkbcommon ];
+  propagatedBuildInputs = [ libGL ];
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+    libX11
+    libXrandr
+    libXinerama
+    libXcursor
+    libXi
+    libXext
+  ];
+  buildInputs = [ libGL wayland wayland-protocols libxkbcommon ];
 
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON"
     "-DGLFW_USE_WAYLAND=ON"
+    "-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${
+      lib.getLib libGL
+    }/lib/libGL.so.1\"'"
     "-DCMAKE_C_FLAGS=-D_GLFW_EGL_LIBRARY='\"${
       lib.getLib libGL
     }/lib/libEGL.so.1\"'"