alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

glib: Use libiconvOrNull' instead of libiconv'.

Browse source
This commit is contained in:
Ludovic Courtès 2012-08-21 15:53:43 +02:00
parent f959a26e33
commit 11602dad82
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/glib/2.30.x.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, libffi
{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrNull, zlib, libffi
, python, pcre }:
# TODO:
@ -20,7 +20,11 @@ stdenv.mkDerivation rec {
};
# configure script looks for d-bus but it is only needed for tests
buildInputs = [ pcre ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
buildInputs = [ pcre ]
++ (if libiconvOrNull != null
then [ libiconvOrNull ]
else []);
buildNativeInputs = [ perl pkgconfig gettext python ];
propagatedBuildInputs = [ zlib libffi ];