diff options
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/vala/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/cairo/1.12.2.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 9 |
3 files changed, 7 insertions, 13 deletions
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 37867b6a36e3..13a0081a2574 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz, libiconvOrEmpty }: +{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, libintlOrEmpty }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ yacc flex pkgconfig ]; - buildInputs = [ glib ] ++ libiconvOrEmpty; + buildInputs = [ glib ] ++ libintlOrEmpty; meta = { description = "Compiler for the GObject type system"; 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 = |