diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-26 14:51:51 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-26 14:51:51 -0400 |
| commit | d5758c99a315faac7e0631ae4e7bd707095be3c1 (patch) | |
| tree | 9177bc0c57faffe2d7fcbc562f43171f67c337eb /pkgs/development/libraries/glib | |
| parent | 3aae4ccffa8bdaea0bcc136c39fdc33729e76af3 (diff) | |
| parent | e710915ffc681b06a61ab2257e44c1cd8abbd0ef (diff) | |
Merge remote-tracking branch 'origin/master' into x-updates
Conflicts: pkgs/misc/maven/maven-1.0.nix pkgs/os-specific/linux/xf86-input-wacom/default.nix
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/2.32.x.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glib/2.32.x.nix b/pkgs/development/libraries/glib/2.32.x.nix index 40e0b81cb9382..8fd77b025891f 100644 --- a/pkgs/development/libraries/glib/2.32.x.nix +++ b/pkgs/development/libraries/glib/2.32.x.nix @@ -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 ]; |