public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vscode*: add libxshmfence to buildInputs

Browse Source 
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.
This commit is contained in:
Florian Klink 2021-03-16 22:09:45 +01:00
parent b702a56d41
commit 510171f2b6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/vscode/generic.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, makeDesktopItem { stdenv, lib, makeDesktopItem
, unzip, libsecret, libXScrnSaver, wrapGAppsHook , unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook
, gtk2, atomEnv, at-spi2-atk, autoPatchelfHook , gtk2, atomEnv, at-spi2-atk, autoPatchelfHook
, systemd, fontconfig, libdbusmenu , systemd, fontconfig, libdbusmenu
@ -63,7 +63,7 @@ in
buildInputs = (if stdenv.isDarwin buildInputs = (if stdenv.isDarwin
then [ unzip ] then [ unzip ]
else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages) else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages)
++ [ libsecret libXScrnSaver ]; ++ [ libsecret libXScrnSaver libxshmfence ];
runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ]; runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ];