diff options
author | Sander van der Burg <s.vanderburg@tudelft.nl> | 2010-10-18 11:30:44 +0000 |
---|---|---|
committer | Sander van der Burg <s.vanderburg@tudelft.nl> | 2010-10-18 11:30:44 +0000 |
commit | 0cc4ca1fcdab90404acf8b912055038c46ad6dd8 (patch) | |
tree | 2aebcbb25942c36ff5afef778101eba831a483ad /pkgs/development | |
parent | 4f2754126160ae7fdb93df3a1898639aa0b163b4 (diff) |
Changed my dirty libiconv hacks I once made for i686-freebsd, into a more consistent manner by checking for a non-Linux platform in the build expressions. Hopefully, this increases portability for non-Linux platforms
svn path=/nixpkgs/trunk/; revision=24347
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/dbus-glib/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/glib/2.22.x.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/glib/2.24.x.nix | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index e21a5d66a0e2d..4a2cd6f4cf957 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1p0bm5p8g8h0mimhj0d58dqdrhfipvcwv95l6hf69z4gygksclak"; }; - buildInputs = [ pkgconfig expat gettext libiconv ]; + buildInputs = [ pkgconfig expat gettext ] + ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; propagatedBuildInputs = [ dbus.libs glib ]; diff --git a/pkgs/development/libraries/glib/2.22.x.nix b/pkgs/development/libraries/glib/2.22.x.nix index 9148639c2d0ed..f9129f7ae4a5c 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 6fdb18e9b4dc1..5c97ab3c7d8e0 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 perl libiconv ]; + buildInputs = [ pkgconfig gettext perl ] + ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; propagatedBuildInputs = [ zlib ]; |