ffmpeg: fix build on darwin

* build with gccApple
* don't delete '*.a' files when building xvidcore

pkgs/development/libraries/ffmpeg/default.nix

@@ -78,8 +78,10 @@ stdenv.mkDerivation rec {
     inherit vdpauSupport;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
-    homepage = http://www.ffmpeg.org/;
+    homepage    = http://www.ffmpeg.org/;
     description = "A complete, cross-platform solution to record, convert and stream audio and video";
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 }

pkgs/development/libraries/xvidcore/default.nix

@@ -12,11 +12,20 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ nasm ];
 
-  postInstall =
+  buildInputs = [ nasm ]
-    ''
+    ++ stdenv.lib.optionals stdenv.isDarwin [ autoconf automake libtool ];
-      rm $out/lib/*.a
+
-      (cd $out/lib && ln -s *.so.4.* libxvidcore.so && ln -s *.so.4.* libxvidcore.so.4 )
+  # don't delete the '.a' files on darwin -- they're needed to compile ffmpeg
-    '';
+  # (and perhaps other things)
+  postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    rm $out/lib/*.a
+  '' + ''
+    cd $out/lib
+    ln -s *.so.4.* libxvidcore.so
+    if [ ! -e libxvidcore.so.4 ]; then
+        ln -s *.so.4.* libxvidcore.so.4
+    fi
+  '';
   
   meta = {
     description = "MPEG-4 video codec for PC";

pkgs/top-level/all-packages.nix

@@ -3896,6 +3896,10 @@ let
 
   ffmpeg = callPackage ../development/libraries/ffmpeg {
     vpxSupport = !stdenv.isMips;
+
+    stdenv = if stdenv.isDarwin
+      then overrideGCC stdenv gccApple
+      else stdenv;
   };
 
   ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix {