nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 12:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #218281 from K900/ffmpeg5-vulkan-fix

Browse Source 
[staging-next] ffmpeg-5: fix Vulkan builds
This commit is contained in:
K900 2023-02-25 21:51:51 +03:00 committed by GitHub
commit 7f8086c7a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
, zimg
, zlib
, vulkan-headers
, vulkan-loader
, glslang
/*
@ -286,7 +287,6 @@
*/
let
inherit (stdenv) isCygwin isDarwin isFreeBSD isLinux isAarch64;
inherit (lib) optional optionals optionalString enableFeature;
in
@ -342,6 +342,10 @@ stdenv.mkDerivation (finalAttrs: {
--replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
substituteInPlace doc/filters.texi \
--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;
@ -593,7 +597,7 @@ stdenv.mkDerivation (finalAttrs: {
++ optionals withVorbis [ libvorbis ]
++ optionals withVpx [ libvpx ]
++ optionals withV4l2 [ libv4l ]
++ optionals withVulkan [ vulkan-loader ]
++ optionals withVulkan [ vulkan-headers vulkan-loader ]
++ optionals withWebp [ libwebp ]
++ optionals withX264 [ x264 ]
++ optionals withX265 [ x265 ]