From 0cc4ca1fcdab90404acf8b912055038c46ad6dd8 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 18 Oct 2010 11:30:44 +0000 Subject: 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 --- pkgs/development/libraries/dbus-glib/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries/dbus-glib') 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 ]; -- cgit 1.4.1