diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-08-21 15:53:43 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-08-21 15:53:43 +0200 |
| commit | 11602dad82867c7f82424cead91b84c8810bb764 (patch) | |
| tree | 989f2aaa236a912465fdabe0bd9dacc1aa9df6be /pkgs/development/libraries/glib/2.30.x.nix | |
| parent | f959a26e3335f8896a35fa5eb1f93f6346b74ea8 (diff) | |
| download | nixpkgs-11602dad82867c7f82424cead91b84c8810bb764.tar nixpkgs-11602dad82867c7f82424cead91b84c8810bb764.tar.gz nixpkgs-11602dad82867c7f82424cead91b84c8810bb764.tar.bz2 nixpkgs-11602dad82867c7f82424cead91b84c8810bb764.tar.lz nixpkgs-11602dad82867c7f82424cead91b84c8810bb764.tar.xz nixpkgs-11602dad82867c7f82424cead91b84c8810bb764.tar.zst nixpkgs-11602dad82867c7f82424cead91b84c8810bb764.zip | |
glib: Use `libiconvOrNull' instead of `libiconv'.
Diffstat (limited to 'pkgs/development/libraries/glib/2.30.x.nix')
| -rw-r--r-- | pkgs/development/libraries/glib/2.30.x.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glib/2.30.x.nix b/pkgs/development/libraries/glib/2.30.x.nix index 092fa7f27e0..72baf0154d9 100644 --- a/pkgs/development/libraries/glib/2.30.x.nix +++ b/pkgs/development/libraries/glib/2.30.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 ]; |