ffmpeg: fix build on darwin
* build with gccApple * don't delete '*.a' files when building xvidcore
This commit is contained in:
parent
7ef50f5098
commit
735555d86f
|
@ -78,8 +78,10 @@ stdenv.mkDerivation rec {
|
|||
inherit vdpauSupport;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = http://www.ffmpeg.org/;
|
||||
meta = with stdenv.lib; {
|
||||
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;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -12,11 +12,20 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ nasm ];
|
||||
|
||||
postInstall =
|
||||
''
|
||||
rm $out/lib/*.a
|
||||
(cd $out/lib && ln -s *.so.4.* libxvidcore.so && ln -s *.so.4.* libxvidcore.so.4 )
|
||||
'';
|
||||
buildInputs = [ nasm ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ autoconf automake libtool ];
|
||||
|
||||
# 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";
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue