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

some libintl and libiconv cleanups + non-linux fixes

Browse Source
This commit is contained in:
Vladimír Čunát
2013-04-14 13:43:09 +02:00
parent 56afb97e87
commit d8a2ae8d01
5 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/cairo/1.12.2.nix
+2 -5
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 =
pkgs/development/libraries/cairo/default.nix
+3 -6
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;
@@ -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 =