public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pulling PangoFontsetSimple patch and propagating harfbuzz

This commit is contained in:
Dima 2019-10-22 00:49:21 +02:00
parent 23edc9cf14
commit db174675f1
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/pango/default.nix
View File

@ -18,6 +18,15 @@ in stdenv.mkDerivation rec {
sha256 = "0v7qq3fv1c0dl80d4qxsvd6cmhh4ngih3w0zc40f4dw7hfx427iy"; sha256 = "0v7qq3fv1c0dl80d4qxsvd6cmhh4ngih3w0zc40f4dw7hfx427iy";
}; };
# 1.44.6-2 is not available from the usual mirrors yet,
# so applying from gitlab
patches = [
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/pango/commit/8a408d4f25ddb0e3d6020cdde0cd8f8a19ee8db2.patch";
sha256 = "0l0hxwbijqrfvka302ijgih9jafc2ffs3d6d4v7bwynpn54lmza7";
})
];
# FIXME: docs fail on darwin # FIXME: docs fail on darwin
outputs = [ "bin" "dev" "out" ] ++ optional (!stdenv.isDarwin) "devdoc"; outputs = [ "bin" "dev" "out" ] ++ optional (!stdenv.isDarwin) "devdoc";
@ -26,14 +35,14 @@ in stdenv.mkDerivation rec {
pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43
]; ];
buildInputs = [ buildInputs = [
harfbuzz fribidi fribidi
] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
ApplicationServices ApplicationServices
Carbon Carbon
CoreGraphics CoreGraphics
CoreText CoreText
]); ]);
propagatedBuildInputs = [ cairo glib libintl ] ++ propagatedBuildInputs = [ cairo glib libintl harfbuzz ] ++
optional x11Support libXft; optional x11Support libXft;
mesonFlags = [ mesonFlags = [