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.
This commit is contained in:
parent
f79bf2c3c0
commit
902d38e9b3
@ -1,30 +1,49 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
|
{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
|
||||||
, libintl, gobject-introspection, darwin, fribidi, gnome3
|
, libintl, gobject-introspection, darwin, fribidi, gnome3
|
||||||
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf
|
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf
|
||||||
|
, meson, ninja, glib
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "pango";
|
pname = "pango";
|
||||||
version = "1.42.4";
|
version = "1.43.0";
|
||||||
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 = "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx";
|
sha256 = "1lnxldmv1a12dq5h0dlq5jyzl4w75k76dp8cn360x2ijlm9w5h6j";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "bin" "dev" "out" "devdoc" ];
|
outputs = [ "bin" "dev" "out" "devdoc" ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 ];
|
nativeBuildInputs = [
|
||||||
buildInputs = optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
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
|
Carbon
|
||||||
CoreGraphics
|
CoreGraphics
|
||||||
CoreText
|
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;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user