Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #28614 - yvt:chore-fix-wayland, r=jdm

Browse source 
`shell.nix`: Add `libxkbcommon` to `LD_LIBRARY_PATH`

`libxkbcommon` is a runtime dependency of winit's Wayland backend. Servo crashes with [a very confusing panic message][1] if the Wayland backend is selected, and `libxkbcommon.so` can't be found at runtime.

[1]: https://github.com/rust-windowing/winit/issues/1760

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)

---
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they don't affect the production code
This commit is contained in:
bors-servo 2021-10-16 10:27:51 -04:00 • committed by GitHub
commit 31ec9c4ffe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
etc/shell.nix
View file

@ -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 ]}
# Fix invalid option errors during linking
# https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328
unset AS