Skip to content

Commit 822b02e

Browse files
committed
Get rid of x11 deps
1 parent 28e788f commit 822b02e

1 file changed

Lines changed: 22 additions & 22 deletions

File tree

flake.nix

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@
4343
mesa
4444

4545
# X11
46-
xorg.libX11
47-
xorg.libXcursor
48-
xorg.libXrandr
49-
xorg.libXinerama
50-
xorg.libXi
51-
xorg.libXxf86vm
46+
libx11
47+
libxcursor
48+
libxrandr
49+
libxinerama
50+
libxi
51+
libxxf86vm
5252

5353
# Wayland
5454
wayland
@@ -210,14 +210,14 @@
210210
libGL
211211
libGL.dev
212212
mesa
213-
xorg.libX11
214-
xorg.libX11.dev
215-
xorg.libXcursor
216-
xorg.libXrandr
217-
xorg.libXinerama
218-
xorg.libXi
219-
xorg.libXxf86vm
220-
xorg.xorgproto
213+
libx11
214+
libx11.dev
215+
libxcursor
216+
libxrandr
217+
libxinerama
218+
libxi
219+
libxxf86vm
220+
xorgproto
221221
wayland
222222
wayland.dev
223223
wayland-protocols
@@ -330,20 +330,20 @@
330330
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath (with pkgs; [
331331
libGL
332332
mesa
333-
xorg.libX11
334-
xorg.libXcursor
335-
xorg.libXrandr
336-
xorg.libXinerama
337-
xorg.libXi
338-
xorg.libXxf86vm
333+
libx11
334+
libxcursor
335+
libxrandr
336+
libxinerama
337+
libxi
338+
libxxf86vm
339339
wayland
340340
libxkbcommon
341341
glfw
342342
]);
343343

344344
# Include paths for C headers
345-
CGO_CFLAGS = "-I${pkgs.xorg.libX11.dev}/include -I${pkgs.xorg.xorgproto}/include -I${pkgs.libGL.dev}/include";
346-
CGO_LDFLAGS = "-L${pkgs.xorg.libX11}/lib -L${pkgs.libGL}/lib";
345+
CGO_CFLAGS = "-I${pkgs.libx11.dev}/include -I${pkgs.xorgproto}/include -I${pkgs.libGL.dev}/include";
346+
CGO_LDFLAGS = "-L${pkgs.libx11}/lib -L${pkgs.libGL}/lib";
347347

348348
shellHook = ''
349349
echo "🚀 Kartoza Timesheet App Development Environment"

0 commit comments

Comments
 (0)