Skip to content

Commit 0681529

Browse files
committed
ffmpeg_7-full: Enable xev{d,e} on all Darwin system
Only aarch64-linux is known to be incompatible currently. By conditioning the option on the xev{d,e}.meta.broken attribute the features will automatically be enabled when xev{d,e} are no longer broken on aarch64-linux.
1 parent e18c970 commit 0681529

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

pkgs/development/libraries/ffmpeg/generic.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,8 @@
129129
, withXcbShape ? withFullDeps # X11 grabbing shape rendering
130130
, withXcbShm ? withFullDeps # X11 grabbing shm communication
131131
, withXcbxfixes ? withFullDeps # X11 grabbing mouse rendering
132-
# Currently only supports gcc and msvc as compiler, the limitation for clang get removed in the next release, but that does not fix building on darwin.
133-
, withXevd ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 && stdenv.cc.isGNU # MPEG-5 EVC decoding
134-
, withXeve ? withFullDeps && lib.versionAtLeast version "7" && stdenv.hostPlatform.isx86 && stdenv.cc.isGNU # MPEG-5 EVC encoding
132+
, withXevd ? withFullDeps && lib.versionAtLeast version "7" && !xevd.meta.broken # MPEG-5 EVC decoding
133+
, withXeve ? withFullDeps && lib.versionAtLeast version "7" && !xeve.meta.broken # MPEG-5 EVC encoding
135134
, withXlib ? withFullDeps # Xlib support
136135
, withXml2 ? withFullDeps # libxml2 support, for IMF and DASH demuxers
137136
, withXvid ? withHeadlessDeps && withGPL # Xvid encoder, native encoder exists

0 commit comments

Comments
 (0)