gregor/jprototerm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix x11 lib namnes

Browse Source
This commit is contained in:
Gregor Lohaus
2026-05-27 16:22:13 +02:00
parent b60dcd5918
commit 4e9f1487cb
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
flake.nix
View File

@@ -48,6 +48,8 @@
"${openjfx}/modules_libs/javafx.graphics" "${openjfx}/modules_libs/javafx.graphics"
"${openjfx}/modules_libs/javafx.media" "${openjfx}/modules_libs/javafx.media"
]; ];
x11 = name: oldName:
if pkgs ? ${name} then pkgs.${name} else pkgs.xorg.${oldName};
runtimeLibraryPath = pkgs.lib.makeLibraryPath ([ runtimeLibraryPath = pkgs.lib.makeLibraryPath ([
openjfx openjfx
jlib jlib
@@ -62,18 +64,18 @@
pkgs.libxkbcommon pkgs.libxkbcommon
pkgs.zlib pkgs.zlib
pkgs.stdenv.cc.cc.lib pkgs.stdenv.cc.cc.lib
pkgs.xorg.libX11 (x11 "libx11" "libX11")
pkgs.xorg.libXext (x11 "libxext" "libXext")
pkgs.xorg.libXrender (x11 "libxrender" "libXrender")
pkgs.xorg.libXtst (x11 "libxtst" "libXtst")
pkgs.xorg.libXi (x11 "libxi" "libXi")
pkgs.xorg.libXcursor (x11 "libxcursor" "libXcursor")
pkgs.xorg.libXrandr (x11 "libxrandr" "libXrandr")
pkgs.xorg.libXinerama (x11 "libxinerama" "libXinerama")
pkgs.xorg.libxcb (x11 "libxcb" "libxcb")
] ]
++ pkgs.lib.optionals (pkgs ? atk) [ pkgs.atk ] ++ pkgs.lib.optionals (pkgs ? atk) [ pkgs.atk ]
++ pkgs.lib.optionals (pkgs.xorg ? libXxf86vm) [ pkgs.xorg.libXxf86vm ] ++ pkgs.lib.optionals (pkgs ? libxxf86vm || pkgs.xorg ? libXxf86vm) [ (x11 "libxxf86vm" "libXxf86vm") ]
++ pkgs.lib.optionals (pkgs ? libGL) [ pkgs.libGL ] ++ pkgs.lib.optionals (pkgs ? libGL) [ pkgs.libGL ]
++ pkgs.lib.optionals (pkgs ? mesa) [ pkgs.mesa ]); ++ pkgs.lib.optionals (pkgs ? mesa) [ pkgs.mesa ]);
in { in {