diff options
author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-03-07 19:23:48 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-04-05 12:13:33 +0200 |
commit | 902d38e9b3473d08850cff8362ef87c6678b895c (patch) | |
tree | c8f07850d08751ef8181911ac8bb701c30bcaa94 /pkgs/development/libraries/pango/default.nix | |
parent | f79bf2c3c03211c467605b07041d1f9909e2c59b (diff) | |
download | nixpkgs-902d38e9b3473d08850cff8362ef87c6678b895c.tar nixpkgs-902d38e9b3473d08850cff8362ef87c6678b895c.tar.gz nixpkgs-902d38e9b3473d08850cff8362ef87c6678b895c.tar.bz2 nixpkgs-902d38e9b3473d08850cff8362ef87c6678b895c.tar.lz nixpkgs-902d38e9b3473d08850cff8362ef87c6678b895c.tar.xz nixpkgs-902d38e9b3473d08850cff8362ef87c6678b895c.tar.zst nixpkgs-902d38e9b3473d08850cff8362ef87c6678b895c.zip |
pango: 1.42.4 -> 1.43.0
New meson build didn't specify gobject as a required dependency, pull in upstream patch to fix. Also move harfbuzz and fribid to buildInputs as those are actually private deps.
Diffstat (limited to 'pkgs/development/libraries/pango/default.nix')
-rw-r--r-- | pkgs/development/libraries/pango/default.nix | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 7b1d69ed42b..6fbae1fa3c3 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,30 +1,49 @@ { stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz , libintl, gobject-introspection, darwin, fribidi, gnome3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf +, meson, ninja, glib }: with stdenv.lib; let pname = "pango"; - version = "1.42.4"; + version = "1.43.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx"; + sha256 = "1lnxldmv1a12dq5h0dlq5jyzl4w75k76dp8cn360x2ijlm9w5h6j"; }; outputs = [ "bin" "dev" "out" "devdoc" ]; - nativeBuildInputs = [ pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + nativeBuildInputs = [ + meson ninja + pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 + ]; + buildInputs = [ + harfbuzz fribidi + ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ApplicationServices Carbon CoreGraphics CoreText ]); - propagatedBuildInputs = [ cairo harfbuzz libXft libintl fribidi ]; + propagatedBuildInputs = [ cairo glib libXft libintl ]; + + patches = [ + (fetchurl { + # Add gobject-2 to .pc file + url = "https://gitlab.gnome.org/GNOME/pango/commit/546f4c242d6f4fe312de3b7c918a848e5172e18d.patch"; + sha256 = "034na38cq98vk8gggn3yfr65jmv3jgig8d25zg89wydrandp14yr"; + }) + ]; + + mesonFlags = [ + "-Denable_docs=true" + ]; enableParallelBuilding = true; |