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

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

Browse Source 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/tools/typesetting/tex/texlive/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Mathijs Kwik
2013-09-11 10:51:46 +02:00
parent 2d405ed4d5 aa8e8303e1
commit 1a55c4b89f
567 changed files with 12427 additions and 3449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,8 @@
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz, fontconfig
, libintlOrEmpty }:
, libintlOrEmpty, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "pango-1.32.5"; #.6 needs a not-yet-stable fontconfig
name = "pango-1.32.5"; #.6 and higher need a not-yet-stable fontconfig (!)
src = fetchurl {
url = "mirror://gnome/sources/pango/1.32/${name}.tar.xz";
@@ -11,9 +11,8 @@ stdenv.mkDerivation rec {
outputs = [ "dev" "out" "bin" "doc" ];
NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ];
buildInputs = [ gobjectIntrospection ]
++ stdenv.lib.optionals stdenv.isDarwin [ gettext fontconfig ];
nativeBuildInputs = [ pkgconfig ];