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

ffmpeg-full: fix darwin build

Browse Source 
libglslang is a dependency of vulkan filters, so only makes sense if
those are enabled.
This commit is contained in:
Stéphan Kochen 2021-05-20 07:49:57 +02:00 committed by Jonathan Ringer
parent 9eafeb243a
commit 4b6673216f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,7 +272,6 @@ stdenv.mkDerivation rec {
# On some ARM platforms --enable-thumb # On some ARM platforms --enable-thumb
"--enable-shared" "--enable-shared"
(enableFeature true "pic") (enableFeature true "pic")
(if stdenv.cc.isClang then "--cc=clang" else null)
(enableFeature smallBuild "small") (enableFeature smallBuild "small")
(enableFeature runtimeCpuDetectBuild "runtime-cpudetect") (enableFeature runtimeCpuDetectBuild "runtime-cpudetect")
(enableFeature enableLto "lto") (enableFeature enableLto "lto")
@ -404,7 +403,7 @@ stdenv.mkDerivation rec {
(enableFeature (zeromq4 != null) "libzmq") (enableFeature (zeromq4 != null) "libzmq")
(enableFeature (zlib != null) "zlib") (enableFeature (zlib != null) "zlib")
(enableFeature (isLinux && vulkan-loader != null) "vulkan") (enableFeature (isLinux && vulkan-loader != null) "vulkan")
(enableFeature (glslang != null) "libglslang") (enableFeature (isLinux && vulkan-loader != null && glslang != null) "libglslang")
#(enableFeature (zvbi != null && gplLicensing) "libzvbi") #(enableFeature (zvbi != null && gplLicensing) "libzvbi")
/* /*
* Developer flags * Developer flags
@ -416,6 +415,9 @@ stdenv.mkDerivation rec {
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"--cross-prefix=${stdenv.cc.targetPrefix}" "--cross-prefix=${stdenv.cc.targetPrefix}"
"--enable-cross-compile" "--enable-cross-compile"
] ++ optionals stdenv.cc.isClang [
"--cc=clang"
"--cxx=clang++"
]; ];
nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ]; nativeBuildInputs = [ addOpenGLRunpath perl pkg-config texinfo yasm ];
@ -426,12 +428,12 @@ stdenv.mkDerivation rec {
libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11
libxcb libXv libXext xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr libxcb libXv libXext xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr
samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore
zeromq4 zlib glslang zeromq4 zlib
] ++ optionals openglExtlib [ libGL libGLU ] ] ++ optionals openglExtlib [ libGL libGLU ]
++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optionals nonfreeLicensing [ fdk_aac openssl ]
++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf ++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf
++ optionals isLinux [ alsaLib libraw1394 libv4l vulkan-loader ] ++ optionals isLinux [ alsaLib libraw1394 libv4l vulkan-loader glslang ]
++ optional (isLinux && !isAarch64 && libmfx != null) libmfx ++ optional (isLinux && !isAarch64 && libmfx != null) libmfx
++ optional nvenc nv-codec-headers ++ optional nvenc nv-codec-headers
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation