Merge remote-tracking branch 'origin/master' into multiple-outputs

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libsndfile/default.nix
	pkgs/misc/cups/default.nix
	pkgs/top-level/all-packages.nix

pkgs/development/libraries/libsamplerate/default.nix

@@ -17,14 +17,19 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "bin" "out" ];
 
-  meta = {
+  # need headers from the Carbon.framework in /System/Library/Frameworks to
+  # compile this on darwin -- not sure how to handle
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
+    "-I/System/Library/Frameworks/Carbon.framework/Versions/A/Headers";
+
+  meta = with stdenv.lib; {
     description = "Sample Rate Converter for audio";
-    homepage = http://www.mega-nerd.com/SRC/index.html;
+    homepage    = http://www.mega-nerd.com/SRC/index.html;
     # you can choose one of the following licenses:
-    license = [
-      "GPL"
-      # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf
-      "libsamplerate Commercial Use License"
-    ];
+    # GPL or a commercial-use license (available at
+    # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf)
+    licenses    = with licenses; [ gpl3.shortName unfree ];
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.all;
   };
 }