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

ffmpeg-5: fix Vulkan builds

Browse Source 
- add vulkan-headers as a dependency
- hack around ffmpeg using unstable VK_EXT names for extensions
- drive-by cleanup: remove unused inherit
This commit is contained in:
K900 2023-02-25 19:33:59 +03:00
parent 79a47b8646
commit 2c1ff16299
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -253,6 +253,7 @@
, zeromq4 , zeromq4
, zimg , zimg
, zlib , zlib
, vulkan-headers
, vulkan-loader , vulkan-loader
, glslang , glslang
/* /*
@ -286,7 +287,6 @@
*/ */
let let
inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux isAarch64;
inherit (lib) optional optionals optionalString enableFeature; inherit (lib) optional optionals optionalString enableFeature;
in in
@ -342,6 +342,10 @@ stdenv.mkDerivation (finalAttrs: {
--replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
substituteInPlace doc/filters.texi \ substituteInPlace doc/filters.texi \
--replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
'' + lib.optionalString withVulkan ''
# FIXME: horrible hack, remove for next release
substituteInPlace libavutil/hwcontext_vulkan.c \
--replace VK_EXT_VIDEO_DECODE VK_KHR_VIDEO_DECODE
''; '';
patches = map (patch: fetchpatch patch) extraPatches; patches = map (patch: fetchpatch patch) extraPatches;
@ -593,7 +597,7 @@ stdenv.mkDerivation (finalAttrs: {
++ optionals withVorbis [ libvorbis ] ++ optionals withVorbis [ libvorbis ]
++ optionals withVpx [ libvpx ] ++ optionals withVpx [ libvpx ]
++ optionals withV4l2 [ libv4l ] ++ optionals withV4l2 [ libv4l ]
++ optionals withVulkan [ vulkan-loader ] ++ optionals withVulkan [ vulkan-headers vulkan-loader ]
++ optionals withWebp [ libwebp ] ++ optionals withWebp [ libwebp ]
++ optionals withX264 [ x264 ] ++ optionals withX264 [ x264 ]
++ optionals withX265 [ x265 ] ++ optionals withX265 [ x265 ]