Merge pull request #204344 from trofi/fox_1_6-without-xlibsWrapper

fox_1_6: use xorg.* packages directly instead of xlibsWrapper indirec…

Changed files
+20 -5
pkgs
development
libraries
+20 -5
pkgs/development/libraries/fox/fox-1.6.nix
···
-
{ 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";
···
};
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;