diff options
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/2.22.x.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/glib/2.24.x.nix | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/libraries/glib/2.22.x.nix b/pkgs/development/libraries/glib/2.22.x.nix index 9148639c2d0e..f9129f7ae4a5 100644 --- a/pkgs/development/libraries/glib/2.22.x.nix +++ b/pkgs/development/libraries/glib/2.22.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv ? null}: +{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv}: stdenv.mkDerivation rec { name = "glib-2.22.5"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "802be9c9ffeb631725ffd6ed35af0af309776729a7fab4fcb48f2b0b8fe7245b"; }; - buildInputs = [pkgconfig gettext perl libiconv]; + buildInputs = [pkgconfig gettext perl] + ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; # The nbd package depends on a static version of this library; hence # the default configure flag --disable-static is switched off. diff --git a/pkgs/development/libraries/glib/2.24.x.nix b/pkgs/development/libraries/glib/2.24.x.nix index 0cdff4254b0f..941697875b0c 100644 --- a/pkgs/development/libraries/glib/2.24.x.nix +++ b/pkgs/development/libraries/glib/2.24.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv ? null, zlib }: +{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib }: stdenv.mkDerivation rec { name = "glib-2.24.1"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04"; }; - buildInputs = [ pkgconfig gettext libiconv ]; + buildInputs = [ pkgconfig gettext ] + ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; buildNativeInputs = [ perl ]; propagatedBuildInputs = [ zlib ]; |