diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 6d1c20c85541..e87179202067 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -2,6 +2,7 @@ , unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages , atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu, glib, buildFHSEnv, wayland +, libglvnd # Populate passthru.tests , tests @@ -113,6 +114,9 @@ let # The credentials should be stored in a secure keychain already, so the benefit of this is questionable # in the first place. rm -rf $out/lib/vscode/resources/app/node_modules/vscode-encrypt + + # Unbundle libglvnd as VSCode doesn't include libGLESv2.so.2 which is necessary for GPU acceleration + rm -rf $out/lib/vscode/libGLESv2.so '') + '' runHook postInstall ''; @@ -121,6 +125,7 @@ let gappsWrapperArgs+=( # Add gio to PATH so that moving files to the trash works when not using a desktop environment --prefix PATH : ${glib.bin}/bin + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]} --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" --add-flags ${lib.escapeShellArg commandLineArgs} )