tjh.dev
pango: 1.43.0 -> 1.44.7
+5
-18
pkgs/development/libraries/pango/default.nix
+5
-18
pkgs/development/libraries/pango/default.nix
···
9
9
10
10
let
11
11
pname = "pango";
12
-
version = "1.43.0";
12
+
version = "1.44.7";
13
13
in stdenv.mkDerivation rec {
14
14
name = "${pname}-${version}";
15
15
16
16
src = fetchurl {
17
17
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
18
-
sha256 = "1lnxldmv1a12dq5h0dlq5jyzl4w75k76dp8cn360x2ijlm9w5h6j";
18
+
sha256 = "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6";
19
19
};
20
20
21
21
# FIXME: docs fail on darwin
···
26
26
pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43
27
27
];
28
28
buildInputs = [
29
-
harfbuzz fribidi
29
+
fribidi
30
30
] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
31
31
ApplicationServices
32
32
Carbon
33
33
CoreGraphics
34
34
CoreText
35
35
]);
36
-
propagatedBuildInputs = [ cairo glib libintl ] ++
36
+
propagatedBuildInputs = [ cairo glib libintl harfbuzz ] ++
37
37
optional x11Support libXft;
38
38
39
-
patches = [
40
-
(fetchpatch {
41
-
# Add gobject-2 to .pc file
42
-
url = "https://gitlab.gnome.org/GNOME/pango/commit/546f4c242d6f4fe312de3b7c918a848e5172e18d.patch";
43
-
sha256 = "1cqhy4xbwx3ad7z5d1ks7smf038b9as8c6qy84rml44h0fgiq4m2";
44
-
})
45
-
(fetchpatch {
46
-
# Fixes CVE-2019-1010238
47
-
url = "https://gitlab.gnome.org/GNOME/pango/commit/490f8979a260c16b1df055eab386345da18a2d54.diff";
48
-
sha256 = "1s0qclbaknkx3dkc3n6mlmx3fnhlr2pkncqjkywprpvahmmypr7k";
49
-
})
50
-
];
51
-
52
39
mesonFlags = [
53
-
"-Denable_docs=${if stdenv.isDarwin then "false" else "true"}"
40
+
"-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}"
54
41
];
55
42
56
43
enableParallelBuilding = true;
+4
-2
pkgs/development/python-modules/pygtk/default.nix
+4
-2
pkgs/development/python-modules/pygtk/default.nix
···
1
-
{ stdenv, fetchurl, python, pkgconfig, gtk2, pygobject2, pycairo
1
+
{ stdenv, fetchurl, python, pkgconfig, gtk2, pygobject2, pycairo, pango
2
2
, buildPythonPackage, libglade ? null, isPy3k }:
3
3
4
4
buildPythonPackage rec {
···
13
13
};
14
14
15
15
nativeBuildInputs = [ pkgconfig ];
16
-
buildInputs = stdenv.lib.optional (libglade != null) libglade;
16
+
buildInputs = [
17
+
pango
18
+
] ++ stdenv.lib.optional (libglade != null) libglade;
17
19
18
20
propagatedBuildInputs = [ gtk2 pygobject2 pycairo ];
19
21