diff options
| author | Dima <dgoldin+github@protonmail.ch> | 2019-10-22 00:49:21 +0200 |
|---|---|---|
| committer | Dima <dgoldin+github@protonmail.ch> | 2019-10-22 00:49:21 +0200 |
| commit | db174675f153a7d35ac4633d5bca9986ece36d6a (patch) | |
| tree | fd7630d8a8aa59ccb0ed5a1ec659cc166c4139bb /pkgs | |
| parent | 23edc9cf14d3a7c427abfb69fe8b542ed5bf0365 (diff) | |
| download | nixpkgs-db174675f153a7d35ac4633d5bca9986ece36d6a.tar nixpkgs-db174675f153a7d35ac4633d5bca9986ece36d6a.tar.gz nixpkgs-db174675f153a7d35ac4633d5bca9986ece36d6a.tar.bz2 nixpkgs-db174675f153a7d35ac4633d5bca9986ece36d6a.tar.lz nixpkgs-db174675f153a7d35ac4633d5bca9986ece36d6a.tar.xz nixpkgs-db174675f153a7d35ac4633d5bca9986ece36d6a.tar.zst nixpkgs-db174675f153a7d35ac4633d5bca9986ece36d6a.zip | |
pulling PangoFontsetSimple patch and propagating harfbuzz
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/pango/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 05260ee427b..073dc38bb09 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -18,6 +18,15 @@ in stdenv.mkDerivation rec { 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 outputs = [ "bin" "dev" "out" ] ++ optional (!stdenv.isDarwin) "devdoc"; @@ -26,14 +35,14 @@ in stdenv.mkDerivation rec { pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ - harfbuzz fribidi + fribidi ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Carbon CoreGraphics CoreText ]); - propagatedBuildInputs = [ cairo glib libintl ] ++ + propagatedBuildInputs = [ cairo glib libintl harfbuzz ] ++ optional x11Support libXft; mesonFlags = [ |