diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-17 18:26:28 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-17 18:26:28 +0200 |
| commit | ec736312d44e4cf63c1f86c7c38f2c2f28d1212e (patch) | |
| tree | 283a3734e8c4c39c8d5df06c1dfcdaa63680fe95 /pkgs/development/libraries/cairo | |
| parent | 6bd036d5f9e4f1c5caa305c98c379f986d3bc402 (diff) | |
| parent | 3f0ee819e2f15e8513d99c3569761fe8cd0bd8de (diff) | |
| download | nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar.gz nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar.bz2 nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar.lz nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar.xz nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.tar.zst nixlib-ec736312d44e4cf63c1f86c7c38f2c2f28d1212e.zip | |
Merge branch 'master' into x-updates
Conflicts: pkgs/development/compilers/vala/default.nix (it's different version) pkgs/development/libraries/cairo/default.nix (trivial)
Diffstat (limited to 'pkgs/development/libraries/cairo')
| -rw-r--r-- | pkgs/development/libraries/cairo/1.12.2.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/development/libraries/cairo/1.12.2.nix b/pkgs/development/libraries/cairo/1.12.2.nix index 254998b6e7a1..18195017c0fb 100644 --- a/pkgs/development/libraries/cairo/1.12.2.nix +++ b/pkgs/development/libraries/cairo/1.12.2.nix @@ -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 = diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 0f49c656d8e8..65f826c7ed43 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -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 = |