From d6ba013513b8a7fd47a1f58094a8b04e79d53a6c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 3 Dec 2022 20:05:40 +0000 Subject: [PATCH] fox_1_6: use xorg.* packages directly instead of xlibsWrapper indirection Validated as no change in `out` output with `diffoscope`. --- pkgs/development/libraries/fox/fox-1.6.nix | 25 +++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index c239210163c2e..b5b86cbe48a03 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -1,6 +1,21 @@ -{ lib, stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor -, libXrandr, libGLU, libGL, libXft, libXfixes, xinput -, CoreServices }: +{ lib +, stdenv +, fetchurl +, libpng +, libjpeg +, libtiff +, zlib +, bzip2 +, libXcursor +, libXrandr +, libGLU +, libGL +, libXext +, libXft +, libXfixes +, xinput +, CoreServices +}: stdenv.mkDerivation rec { pname = "fox"; @@ -12,8 +27,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr - libXft libGLU libGL libXfixes xinput + libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr + libXext libXft libGLU libGL libXfixes xinput ] ++ lib.optional stdenv.isDarwin CoreServices; doCheck = true;