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

[staging] pango: 1.40.14 -> 1.42.1 (#43171)

Browse Source
This commit is contained in:
volth 2018-07-16 09:55:24 +00:00 committed by xeji
parent e515b04e08
commit 2efc2ada84
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,19 +1,19 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz { stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz, fribidi
, libintl, gobjectIntrospection, darwin , libintl, gobjectIntrospection, darwin
}: }:
with stdenv.lib; with stdenv.lib;
let let
ver_maj = "1.40"; ver_maj = "1.42";
ver_min = "14"; ver_min = "1";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pango-${ver_maj}.${ver_min}"; name = "pango-${ver_maj}.${ver_min}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
sha256 = "90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3"; sha256 = "0cnfgcya3wbs9m8g44cl5ww6wbp6qbw96qvsgkr8ymwqn9b6fnli";
}; };
outputs = [ "bin" "dev" "out" "devdoc" ]; outputs = [ "bin" "dev" "out" "devdoc" ];
@ -25,17 +25,10 @@ stdenv.mkDerivation rec {
CoreGraphics CoreGraphics
CoreText CoreText
]); ]);
propagatedBuildInputs = [ cairo harfbuzz libXft libintl ]; propagatedBuildInputs = [ cairo harfbuzz libXft libintl fribidi ];
enableParallelBuilding = true; 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"; configureFlags = optional stdenv.isDarwin "--without-x";
meta = with stdenv.lib; { meta = with stdenv.lib; {