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

Merge remote-tracking branch 'origin/master' into multiple-outputs

Browse Source 
Conflicts:
	pkgs/development/libraries/acl/default.nix
	pkgs/development/libraries/atk/2.6.x.nix
	pkgs/development/libraries/attr/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/2.34.x.nix
	pkgs/development/libraries/gtk+/2.24.x.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/openssl/default.nix
	pkgs/development/libraries/pango/1.30.x.nix
	pkgs/misc/cups/default.nix
	pkgs/os-specific/linux/util-linux/default.nix
	pkgs/servers/x11/xorg/builder.sh
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Eelco Dolstra
2013-06-09 00:41:27 +02:00
parent 61129e1ee9 8c4a613f3a
commit 99b88cfb53
3321 changed files with 87541 additions and 48046 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/pango/1.29.x.nix → pkgs/development/libraries/pango/1.30.x.nix
View File

@@ -1,23 +1,23 @@
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, fontconfig }:
stdenv.mkDerivation rec {
name = "pango-1.29.4";
name = "pango-1.30.1";
src = fetchurl {
url = mirror://gnome/sources/pango/1.29/pango-1.29.4.tar.xz;
sha256 = "0zqjq6ccv6mbah74rcvb03ksq1jwan21z37mdmqa56307sax3s3s";
url = "mirror://gnome/sources/pango/1.30/${name}.tar.xz";
sha256 = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe";
};
enableParallelBuilding = true;
outputs = [ "dev" "out" "bin" "doc" ];
buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ];
buildNativeInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ x11 glib cairo libpng ];
enableParallelBuilding = true;
meta = {
description = "A library for laying out and rendering of text, with an emphasis on internationalization";