summary refs log tree commit diff
path: root/pkgs/development/libraries/dbus-glib
diff options
context:
space:
mode:
authorSander van der Burg <s.vanderburg@tudelft.nl>2010-10-18 11:30:44 +0000
committerSander van der Burg <s.vanderburg@tudelft.nl>2010-10-18 11:30:44 +0000
commit0cc4ca1fcdab90404acf8b912055038c46ad6dd8 (patch)
tree2aebcbb25942c36ff5afef778101eba831a483ad /pkgs/development/libraries/dbus-glib
parent4f2754126160ae7fdb93df3a1898639aa0b163b4 (diff)
downloadnixpkgs-0cc4ca1fcdab90404acf8b912055038c46ad6dd8.tar
nixpkgs-0cc4ca1fcdab90404acf8b912055038c46ad6dd8.tar.gz
nixpkgs-0cc4ca1fcdab90404acf8b912055038c46ad6dd8.tar.bz2
nixpkgs-0cc4ca1fcdab90404acf8b912055038c46ad6dd8.tar.lz
nixpkgs-0cc4ca1fcdab90404acf8b912055038c46ad6dd8.tar.xz
nixpkgs-0cc4ca1fcdab90404acf8b912055038c46ad6dd8.tar.zst
nixpkgs-0cc4ca1fcdab90404acf8b912055038c46ad6dd8.zip
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.nix3
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 e21a5d66a0e..4a2cd6f4cf9 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 ];