nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

oops

This commit is contained in:
Nathan McCarty 2023-02-08 23:44:28 -05:00
parent 5a76c0839e
commit 446cea1f1d
Signed by: thatonelutenist
GPG Key ID: D70DA3DD4D1E9F96
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
home-manager/linux/programs/devel.nix
View File

@ -30,7 +30,7 @@ with nLib; {
# JVM Development # JVM Development
(mkIf devel.jvm { (mkIf devel.jvm {
home.packages = with unstable; [ home.packages = with unstable; [
jdk jdk17
gradle gradle
kotlin kotlin
kotlin-native kotlin-native

19
packages/glfw-minecraft-wayland/default.nix
View File

@ -18,14 +18,25 @@ stdenv.mkDerivation rec {
./0007-Platform-Prefer-Wayland-over-X11.patch ./0007-Platform-Prefer-Wayland-over-X11.patch
]; ];
propagatedBuildInputs = propagatedBuildInputs = [ libGL ];
[ libGL libX11 libXrandr libXinerama libXcursor libXi libXext ]; nativeBuildInputs = [
nativeBuildInputs = [ cmake extra-cmake-modules ]; cmake
buildInputs = [ wayland wayland-protocols libxkbcommon ]; extra-cmake-modules
libX11
libXrandr
libXinerama
libXcursor
libXi
libXext
];
buildInputs = [ libGL wayland wayland-protocols libxkbcommon ];
cmakeFlags = [ cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"
"-DGLFW_USE_WAYLAND=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='\"${ "-DCMAKE_C_FLAGS=-D_GLFW_EGL_LIBRARY='\"${
lib.getLib libGL lib.getLib libGL
}/lib/libEGL.so.1\"'" }/lib/libEGL.so.1\"'"