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
2010-10-18 11:30:44 +00:00
parent 4f27541261
commit 0cc4ca1fcd
4 changed files with 11 additions and 13 deletions
@@ -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 ];