From 711bc5f86c903da6ba6934cba0aa585725d95ba6 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 08:39:03 +0100 Subject: [PATCH] zoom: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/games/zoom/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index e281caee72a2..818d9deda483 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -3,8 +3,9 @@ , fetchurl , perl , expat -, xlibsWrapper +, fontconfig , freetype +, xorg }: # !!! assert freetype == xorg.freetype @@ -18,7 +19,17 @@ stdenv.mkDerivation rec { hash = "sha256-8pZ/HAVV341K6QRDUC0UzzO2rGW2AvSZ++Pp445V27w="; }; - buildInputs = [ perl expat xlibsWrapper freetype ]; + buildInputs = [ + perl + expat + fontconfig + freetype + xorg.libICE + xorg.libSM + xorg.libX11 + xorg.libXext + xorg.libXrender + ]; NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2 -fgnu89-inline";