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

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III
2015-09-23 14:44:21 -07:00
parent 3c8b92f4b3 5cfe893cc4
commit d3f4ba9d6f
351 changed files with 12549 additions and 1699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng, harfbuzz
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, glib, cairo, libpng, harfbuzz
, fontconfig, freetype, libintlOrEmpty, gobjectIntrospection
}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
++ optional stdenv.isDarwin fontconfig;
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ x11 glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty;
propagatedBuildInputs = [ xlibsWrapper glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty;
enableParallelBuilding = true;