mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
zoom: use xorg.* packages directly instead of xlibsWrapper indirection
Tested as no material change in `out` output with `diffoscope`.
This commit is contained in:
parent
ebe6f51849
commit
711bc5f86c
@ -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";
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user