pango, gtk3: non-Linux attempts to fix
This commit is contained in:
parent
6b4eaf71fe
commit
4255b343e8
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gettext
|
||||
, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs
|
||||
, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, xlibs, x11
|
||||
, xineramaSupport ? stdenv.isLinux
|
||||
, cupsSupport ? stdenv.isLinux, cups ? null
|
||||
}:
|
||||
@ -18,10 +18,11 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ pkgconfig gettext ];
|
||||
propagatedBuildInputs = with xlibs; [
|
||||
expat glib cairo pango gdk_pixbuf atk at_spi2_atk
|
||||
libXrandr libXrender libXcomposite libXi libXcursor
|
||||
] ++ stdenv.lib.optional xineramaSupport libXinerama
|
||||
propagatedBuildInputs = with xlibs; with stdenv.lib;
|
||||
[ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ]
|
||||
++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor ]
|
||||
++ optional stdenv.isDarwin x11
|
||||
++ stdenv.lib.optional xineramaSupport libXinerama
|
||||
++ stdenv.lib.optionals cupsSupport [ cups ];
|
||||
|
||||
postInstall = "rm -rf $out/share/gtk-doc";
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz, fontconfig }:
|
||||
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz, fontconfig
|
||||
, libintlOrEmpty }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pango-1.32.5"; #.6 needs a not-yet-stable fontconfig
|
||||
@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
propagatedBuildInputs = [ x11 glib cairo libpng harfbuzz ];
|
||||
propagatedBuildInputs = [ x11 glib cairo libpng harfbuzz ] ++ libintlOrEmpty;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user