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

Merge branch 'master' into x-updates

Browse Source 
Conflicts:
	pkgs/development/compilers/vala/default.nix (it's different version)
	pkgs/development/libraries/cairo/default.nix (trivial)
This commit is contained in:
Vladimír Čunát
2013-04-17 18:26:28 +02:00
parent 6bd036d5f9 3f0ee819e2
commit ec736312d4
58 changed files with 13065 additions and 2819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/cairo/1.12.2.nix
View File

@@ -5,7 +5,7 @@
, gobjectSupport ? true, glib
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
, zlib, libpng, pixman, libxcb ? null, xcbutil ? null
, gettext, libiconvOrEmpty
, libiconvOrEmpty, libintlOrEmpty
}:
assert postscriptSupport -> zlib != null;
@@ -23,10 +23,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig x11 fontconfig xlibs.libXrender ]
++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
# On non-GNU systems we need GNU Gettext for libintl.
++ stdenv.lib.optional (!stdenv.isLinux) gettext
++ libintlOrEmpty
++ libiconvOrEmpty;
propagatedBuildInputs =

7
pkgs/development/libraries/cairo/default.nix
View File

@@ -7,7 +7,7 @@
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
, expat
, zlib, libpng, pixman, libxcb ? null, xcbutil ? null, mesa ? null
, gettext, libiconvOrEmpty
, libiconvOrEmpty, libintlOrEmpty
}:
assert postscriptSupport -> zlib != null;
@@ -28,10 +28,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (!stdenv.isDarwin) libXrender
++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
++ stdenv.lib.optionals glSupport [ mesa ]
# On non-GNU systems we need GNU Gettext for libintl.
++ stdenv.lib.optional (!stdenv.isLinux) gettext
++ libintlOrEmpty
++ libiconvOrEmpty;
propagatedBuildInputs =