From 2058d95eb41520f72e8cbb7c0f895d86b0da0769 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 18 Jun 2013 22:02:52 +0200
Subject: [PATCH] non-Linux platforms: extend to some important pkgs

---
 pkgs/applications/audio/flac/default.nix          | 1 +
 pkgs/development/libraries/expat/default.nix      | 1 +
 pkgs/development/libraries/fontconfig/default.nix | 5 ++---
 pkgs/development/libraries/freetype/default.nix   | 1 +
 pkgs/development/libraries/gtk+/2.x.nix           | 2 +-
 pkgs/development/libraries/gtk+/3.x.nix           | 2 +-
 pkgs/development/libraries/libpng/default.nix     | 1 +
 pkgs/development/libraries/poppler/default.nix    | 1 +
 pkgs/tools/networking/curl/default.nix            | 1 +
 9 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index d42147294852..0383a1ce0ad5 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://xiph.org/flac/;
     description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 6b675230119e..d7915a93962c 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -11,5 +11,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.libexpat.org/;
     description = "A stream-oriented XML parser library written in C";
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 2067f3457b63..e3b0a54ee82e 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig freetype expat ];
 
-  #propagatedBuildInputs = [ expat ]; # !!! shouldn't be necessary, but otherwise pango breaks
-
   configureFlags = "--sysconfdir=/etc --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts=";
 
   # We should find a better way to access the arch reliably.
@@ -36,7 +34,7 @@ stdenv.mkDerivation rec {
   # Don't try to write to /etc/fonts or /var/cache/fontconfig at install time.
   installFlags = "sysconfdir=$(out)/etc RUN_FC_CACHE_TEST=false fc_cachedir=$(TMPDIR)/dummy";
 
-  postInstall = if !freetype.infinality.useInfinality then "" else ''
+  postInstall = stdenv.lib.optionalString freetype.infinality.useInfinality ''
     cd "$out/etc/fonts" && tar xvf ${infinality_patch}
   '';
 
@@ -44,5 +42,6 @@ stdenv.mkDerivation rec {
     description = "A library for font customization and configuration";
     homepage = http://fontconfig.org/;
     license = "bsd";
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index cff22e9bc577..8fa75425544f 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -75,5 +75,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.freetype.org/;
     license = if useEncumberedCode then "unfree"
       else "GPLv2+"; # or the FreeType License (BSD + advertising clause)
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 055d93ef9290..1cd85ae2aa58 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
     license = "LGPLv2+";
 
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index a22e243411aa..796b36f821cd 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
     license = "LGPLv2+";
 
     maintainers = with stdenv.lib.maintainers; [urkud raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 72821ef7028f..0a1506107817 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     description = "The official reference implementation for the PNG file format";
     homepage = http://www.libpng.org/pub/png/libpng.html;
     license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 8e168c2f4114..a871c0ab0d72 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -50,6 +50,7 @@ let
       '';
 
       license = "GPLv2";
+      platforms = stdenv.lib.platforms.all;
     };
   } merge ]); # poppler_drv
 
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index f9439f1b42aa..73dcb44269c3 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -66,5 +66,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://curl.haxx.se/";
     description = "A command line tool for transferring files with URL syntax";
+    platforms = stdenv.lib.platforms.all;
   };
 }