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/libraries/dbus-glib | |
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/libraries/dbus-glib')
-rw-r--r-- | pkgs/development/libraries/dbus-glib/default.nix | 3 |
1 files changed, 2 insertions, 1 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 ]; |