summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2021-03-16 22:09:45 +0100
committerFlorian Klink <flokli@flokli.de>2021-03-16 22:11:05 +0100
commit510171f2b6fb7f2dbdc57e9d531a3758694b318f (patch)
tree7b8b2475c0611ef3863cf84d4c8d2e0772c52720
parentb702a56d417647de4090ac56c0f18bdc7e646610 (diff)
downloadnixpkgs-510171f2b6fb7f2dbdc57e9d531a3758694b318f.tar
nixpkgs-510171f2b6fb7f2dbdc57e9d531a3758694b318f.tar.gz
nixpkgs-510171f2b6fb7f2dbdc57e9d531a3758694b318f.tar.bz2
nixpkgs-510171f2b6fb7f2dbdc57e9d531a3758694b318f.tar.lz
nixpkgs-510171f2b6fb7f2dbdc57e9d531a3758694b318f.tar.xz
nixpkgs-510171f2b6fb7f2dbdc57e9d531a3758694b318f.tar.zst
nixpkgs-510171f2b6fb7f2dbdc57e9d531a3758694b318f.zip
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.
-rw-r--r--pkgs/applications/editors/vscode/generic.nix4
1 files 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 ];