From e61d7f808a1cce0d5be637d7da9e3201e1129343 Mon Sep 17 00:00:00 2001 From: yvt Date: Sat, 16 Oct 2021 00:56:08 +0900 Subject: [PATCH 1/2] chore(nix): add `libxkbcommon` to `LD_LIBRARY_PATH` --- etc/shell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/shell.nix b/etc/shell.nix index 578166b0228..bb2e3b502ab 100644 --- a/etc/shell.nix +++ b/etc/shell.nix @@ -32,7 +32,7 @@ clangStdenv.mkDerivation rec { shellHook = '' # Fix missing libraries errors (those libraries aren't linked against, so we need to dynamically supply them) - export LD_LIBRARY_PATH=${lib.makeLibraryPath [ xorg.libXcursor xorg.libXrandr xorg.libXi ]} + export LD_LIBRARY_PATH=${lib.makeLibraryPath [ xorg.libXcursor xorg.libXrandr xorg.libXi libxkbcommon ]} # Fix invalid option errors during linking # https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328 unset AS From e4cd5a1c96963b591e6751e4264c5cbd59a079b7 Mon Sep 17 00:00:00 2001 From: yvt Date: Sat, 16 Oct 2021 01:21:16 +0900 Subject: [PATCH 2/2] chore(nix): define `LD_LIBRARY_PATH` outside `shellHook` For consistency with other environment variables defined in the same file. --- etc/shell.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/etc/shell.nix b/etc/shell.nix index bb2e3b502ab..dade0d1c367 100644 --- a/etc/shell.nix +++ b/etc/shell.nix @@ -30,9 +30,10 @@ clangStdenv.mkDerivation rec { # Enable colored cargo and rustc output TERMINFO = "${ncurses.out}/share/terminfo"; + # Fix missing libraries errors (those libraries aren't linked against, so we need to dynamically supply them) + LD_LIBRARY_PATH = lib.makeLibraryPath [ xorg.libXcursor xorg.libXrandr xorg.libXi libxkbcommon ]; + shellHook = '' - # Fix missing libraries errors (those libraries aren't linked against, so we need to dynamically supply them) - export LD_LIBRARY_PATH=${lib.makeLibraryPath [ xorg.libXcursor xorg.libXrandr xorg.libXi libxkbcommon ]} # Fix invalid option errors during linking # https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328 unset AS