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

pango: 1.43.0 -> 1.44.7

Browse Source
This commit is contained in:
Dima 2019-10-23 11:41:56 +02:00
parent ce0fd24752
commit e603d2941a
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,13 +9,13 @@ with stdenv.lib;
let let
pname = "pango"; pname = "pango";
version = "1.43.0"; version = "1.44.7";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1lnxldmv1a12dq5h0dlq5jyzl4w75k76dp8cn360x2ijlm9w5h6j"; sha256 = "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6";
}; };
# FIXME: docs fail on darwin # FIXME: docs fail on darwin
@ -26,31 +26,18 @@ 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;
patches = [
(fetchpatch {
# Add gobject-2 to .pc file
url = "https://gitlab.gnome.org/GNOME/pango/commit/546f4c242d6f4fe312de3b7c918a848e5172e18d.patch";
sha256 = "1cqhy4xbwx3ad7z5d1ks7smf038b9as8c6qy84rml44h0fgiq4m2";
})
(fetchpatch {
# Fixes CVE-2019-1010238
url = "https://gitlab.gnome.org/GNOME/pango/commit/490f8979a260c16b1df055eab386345da18a2d54.diff";
sha256 = "1s0qclbaknkx3dkc3n6mlmx3fnhlr2pkncqjkywprpvahmmypr7k";
})
];
mesonFlags = [ mesonFlags = [
"-Denable_docs=${if stdenv.isDarwin then "false" else "true"}" "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

6
pkgs/development/python-modules/pygtk/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, pkgconfig, gtk2, pygobject2, pycairo { stdenv, fetchurl, python, pkgconfig, gtk2, pygobject2, pycairo, pango
, buildPythonPackage, libglade ? null, isPy3k }: , buildPythonPackage, libglade ? null, isPy3k }:
buildPythonPackage rec { buildPythonPackage rec {
@ -13,7 +13,9 @@ buildPythonPackage rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = stdenv.lib.optional (libglade != null) libglade; buildInputs = [
pango
] ++ stdenv.lib.optional (libglade != null) libglade;
propagatedBuildInputs = [ gtk2 pygobject2 pycairo ]; propagatedBuildInputs = [ gtk2 pygobject2 pycairo ];