public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

darwin: ffmpeg-full: add some missing darwin deps

Browse Source
This commit is contained in:
Stéphane Jourdois 2015-11-11 22:56:38 +01:00
parent b096a863a9
commit a2bf64a381
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -138,6 +138,10 @@
, optimizationsDeveloper ? true , optimizationsDeveloper ? true
, extraWarningsDeveloper ? false , extraWarningsDeveloper ? false
, strippingDeveloper ? false , strippingDeveloper ? false
/*
* Darwin frameworks
*/
, Cocoa, CoreServices
}: }:
/* Maintainer notes: /* Maintainer notes:
@ -405,7 +409,8 @@ stdenv.mkDerivation rec {
++ optionals x11grabExtlib [ libXext libXfixes ] ++ optionals x11grabExtlib [ libXext libXfixes ]
++ optionals nonfreeLicensing [ faac fdk_aac openssl ] ++ optionals nonfreeLicensing [ faac fdk_aac openssl ]
++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optionals isLinux [ alsaLib libraw1394 libv4l ]; ++ optionals isLinux [ alsaLib libraw1394 libv4l ]
++ optionals stdenv.isDarwin [ Cocoa CoreServices ];
# Build qt-faststart executable # Build qt-faststart executable
buildPhase = optional qtFaststartProgram ''make tools/qt-faststart''; buildPhase = optional qtFaststartProgram ''make tools/qt-faststart'';

4
pkgs/top-level/all-packages.nix
View File

@ -6256,18 +6256,16 @@ let
# The following need to be fixed on Darwin # The following need to be fixed on Darwin
frei0r = if stdenv.isDarwin then null else frei0r; frei0r = if stdenv.isDarwin then null else frei0r;
game-music-emu = if stdenv.isDarwin then null else game-music-emu; game-music-emu = if stdenv.isDarwin then null else game-music-emu;
gsm = if stdenv.isDarwin then null else gsm;
libjack2 = if stdenv.isDarwin then null else libjack2; libjack2 = if stdenv.isDarwin then null else libjack2;
libmodplug = if stdenv.isDarwin then null else libmodplug; libmodplug = if stdenv.isDarwin then null else libmodplug;
libssh = if stdenv.isDarwin then null else libssh;
libvpx = if stdenv.isDarwin then null else libvpx; libvpx = if stdenv.isDarwin then null else libvpx;
openal = if stdenv.isDarwin then null else openal; openal = if stdenv.isDarwin then null else openal;
openjpeg_1 = if stdenv.isDarwin then null else openjpeg_1;
libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; libpulseaudio = if stdenv.isDarwin then null else libpulseaudio;
samba = if stdenv.isDarwin then null else samba; samba = if stdenv.isDarwin then null else samba;
vid-stab = if stdenv.isDarwin then null else vid-stab; vid-stab = if stdenv.isDarwin then null else vid-stab;
x265 = if stdenv.isDarwin then null else x265; x265 = if stdenv.isDarwin then null else x265;
xavs = if stdenv.isDarwin then null else xavs; xavs = if stdenv.isDarwin then null else xavs;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices;
}; };
ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { }; ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { };