diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-14 13:27:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-14 13:43:09 +0200 |
| commit | d8a2ae8d01b6839d8e88b9a8e822d4a190409a78 (patch) | |
| tree | fec5587f5569ac62e7c24c33e6f243bd83290b43 /pkgs/development/libraries/cairo | |
| parent | 56afb97e877ec0870bbb77e17974da7fcd3b108a (diff) | |
| download | nixlib-d8a2ae8d01b6839d8e88b9a8e822d4a190409a78.tar nixlib-d8a2ae8d01b6839d8e88b9a8e822d4a190409a78.tar.gz nixlib-d8a2ae8d01b6839d8e88b9a8e822d4a190409a78.tar.bz2 nixlib-d8a2ae8d01b6839d8e88b9a8e822d4a190409a78.tar.lz nixlib-d8a2ae8d01b6839d8e88b9a8e822d4a190409a78.tar.xz nixlib-d8a2ae8d01b6839d8e88b9a8e822d4a190409a78.tar.zst nixlib-d8a2ae8d01b6839d8e88b9a8e822d4a190409a78.zip | |
some libintl and libiconv cleanups + non-linux fixes
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 | 9 |
2 files changed, 5 insertions, 11 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 72ea24c9f8ad..8c9f55426d53 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.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; @@ -21,13 +21,10 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig x11 fontconfig ] + [ pkgconfig x11 fontconfig ] ++ stdenv.lib.optional (!stdenv.isDarwin) 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 = |