diff options
| author | volth <volth@webmaster.ms> | 2018-07-16 09:55:24 +0000 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-07-16 11:55:24 +0200 |
| commit | 2efc2ada846eb9db87a6fe6856b39899bd8f5f50 (patch) | |
| tree | 8846e2ff7803891f53d820b63a9ee51a1142c94f /pkgs/development/libraries/pango | |
| parent | e515b04e08f1872f9046ca7875878e141ab9e710 (diff) | |
| download | nixpkgs-2efc2ada846eb9db87a6fe6856b39899bd8f5f50.tar nixpkgs-2efc2ada846eb9db87a6fe6856b39899bd8f5f50.tar.gz nixpkgs-2efc2ada846eb9db87a6fe6856b39899bd8f5f50.tar.bz2 nixpkgs-2efc2ada846eb9db87a6fe6856b39899bd8f5f50.tar.lz nixpkgs-2efc2ada846eb9db87a6fe6856b39899bd8f5f50.tar.xz nixpkgs-2efc2ada846eb9db87a6fe6856b39899bd8f5f50.tar.zst nixpkgs-2efc2ada846eb9db87a6fe6856b39899bd8f5f50.zip | |
[staging] pango: 1.40.14 -> 1.42.1 (#43171)
Diffstat (limited to 'pkgs/development/libraries/pango')
| -rw-r--r-- | pkgs/development/libraries/pango/default.nix | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 9a27901c862..c23e7c9617e 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz +{ stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz, fribidi , libintl, gobjectIntrospection, darwin }: with stdenv.lib; let - ver_maj = "1.40"; - ver_min = "14"; + ver_maj = "1.42"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "pango-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; - sha256 = "90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3"; + sha256 = "0cnfgcya3wbs9m8g44cl5ww6wbp6qbw96qvsgkr8ymwqn9b6fnli"; }; outputs = [ "bin" "dev" "out" "devdoc" ]; @@ -25,17 +25,10 @@ stdenv.mkDerivation rec { CoreGraphics CoreText ]); - propagatedBuildInputs = [ cairo harfbuzz libXft libintl ]; + propagatedBuildInputs = [ cairo harfbuzz libXft libintl fribidi ]; enableParallelBuilding = true; - doCheck = false; # test-layout fails on 1.40.3 (fails to find font config) - # jww (2014-05-05): The tests currently fail on Darwin: - # - # ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0) - # .../bin/sh: line 5: 14823 Abort trap: 6 srcdir=. PANGO_RC_FILE=./pangorc ${dir}$tst - # FAIL: testiter - configureFlags = optional stdenv.isDarwin "--without-x"; meta = with stdenv.lib; { |