From 510171f2b6fb7f2dbdc57e9d531a3758694b318f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 16 Mar 2021 22:09:45 +0100 Subject: [PATCH] vscode*: add libxshmfence to buildInputs Like recent chrom[e,ium], Electron >= 12 applications need libxshmfence. vscode is preparing to switch to electron 12.0.0 (https://github.com/microsoft/vscode/tree/electron-12.x.y). This introduces libxshmfence to the buildInputs of generic.nix, allowing custom builds to reuse the same generic Nix. We'll also need this code as soon as a release with Electron 12.x is out. --- pkgs/applications/editors/vscode/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 470683bad43..e34a55238a9 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeDesktopItem -, unzip, libsecret, libXScrnSaver, wrapGAppsHook +, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook , gtk2, atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu @@ -63,7 +63,7 @@ in buildInputs = (if stdenv.isDarwin then [ unzip ] else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages) - ++ [ libsecret libXScrnSaver ]; + ++ [ libsecret libXScrnSaver libxshmfence ]; runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ];