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

Merge 'staging' into multiple-outputs

Browse Source 
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
This commit is contained in:
Vladimír Čunát
2014-08-23 16:04:53 +02:00
parent db83d9a35b 084626deec
commit 96cec2a7bd
6628 changed files with 165219 additions and 65293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
, libintlOrEmpty, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "pango-1.32.5"; #.6 and higher need a not-yet-stable fontconfig (!)
name = "pango-1.32.5"; #.6 and higher need fontconfig-2.11.* which is troublesome
src = fetchurl {
url = "mirror://gnome/sources/pango/1.32/${name}.tar.xz";
@@ -11,15 +11,21 @@ stdenv.mkDerivation rec {
outputs = [ "dev" "out" "bin" "doc" ];
buildInputs = [ gobjectIntrospection ]
++ stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ];
buildInputs = with stdenv.lib;
optional (!stdenv.isDarwin) gobjectIntrospection # build problems of itself and flex
++ optionals stdenv.isDarwin [ gettext fontconfig ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ x11 glib cairo libpng harfbuzz ] ++ libintlOrEmpty;
enableParallelBuilding = true;
# 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
doCheck = !stdenv.isDarwin;
meta = {
description = "A library for laying out and rendering of text, with an emphasis on internationalization";
@@ -32,9 +38,9 @@ stdenv.mkDerivation rec {
'';
homepage = http://www.pango.org/;
license = "LGPLv2+";
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
}