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

Merge pull request #71571 from d-goldin/bump_pango

Browse Source 
pango: 1.43.0 -> 1.44.6, fixes CVE-2019-1010238
This commit is contained in:
Michael Raskin 2019-10-22 11:32:14 +00:00 committed by GitHub
commit dd5d488d7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,15 +9,24 @@ with stdenv.lib;
let let
pname = "pango"; pname = "pango";
version = "1.43.0"; version = "1.44.6";
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 = "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,26 +35,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";
})
];
mesonFlags = [ mesonFlags = [
"-Denable_docs=${if stdenv.isDarwin then "false" else "true"}" "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;