From 22d28d232ce19a2001e9eca737e0eac788a20642 Mon Sep 17 00:00:00 2001 From: mediocregopher Date: Sun, 17 Dec 2023 18:04:43 +0100 Subject: Figure out how to not use nixGL for alacritty --- alacritty/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'alacritty/default.nix') diff --git a/alacritty/default.nix b/alacritty/default.nix index 15fc3a4..d0c08aa 100644 --- a/alacritty/default.nix +++ b/alacritty/default.nix @@ -38,12 +38,22 @@ (builtins.readFile ./alacritty.yml) ); - alacritty = pkgs.writeScriptBin "alacritty" '' - #!${pkgs.bash}/bin/bash + shellEntrypoint = pkgs.writeShellScript "alacritty-shell-entrypoint" '' + unset LD_LIBRARY_PATH + unset __EGL_VENDOR_LIBRARY_DIRS + exec "${zsh}/bin/zsh" "$@" + ''; + + alacritty = pkgs.writeShellScriptBin "alacritty" '' + # TODO this might break things, especially if the machine is not using + # nvidia, but more investigation is needed. But it at least lets us get rid + # of nixGL. + export LD_LIBRARY_PATH=/usr/lib + export __EGL_VENDOR_LIBRARY_DIRS=/usr/share/glvnd/egl_vendor.d - exec ${pkgs.nixgl}/bin/nixGL ${pkgs.alacritty}/bin/alacritty \ + exec ${pkgs.alacritty}/bin/alacritty \ -o font.size=${builtins.toString config.alacritty.fontSize} \ --config-file ${configFile} \ - -e "${zsh}/bin/zsh" + -e "${shellEntrypoint}" ''; } -- cgit v1.2.3