Merge pull request #204344 from trofi/fox_1_6-without-xlibsWrapper
fox_1_6: use xorg.* packages directly instead of xlibsWrapper indirec…
This commit is contained in:
commit
4d43f178b0
1 changed files with 20 additions and 5 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue