Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ffmpeg: enable vulkan in small variant #281753

Merged
merged 2 commits into from Feb 20, 2024
Merged

ffmpeg: enable vulkan in small variant #281753

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68500c3
ffmpeg: enable vulkan in small variant
Atemu Jan 18, 2024
3f89316
ffmpeg: work around libvulkan.so not being NEEDED
Atemu Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
ffmpeg: work around libvulkan.so not being NEEDED
  • Loading branch information
@Atemu
Atemu committed Feb 15, 2024
commit 3f89316af000885845d34c9a6776d8344af6a4c9
4 changes: 4 additions & 0 deletions pkgs/development/libraries/ffmpeg/generic.nix
View file
Open in desktop
Expand Up @@ -683,6 +683,10 @@ stdenv.mkDerivation (finalAttrs: {
postFixup = optionalString (stdenv.isLinux && withLib) ''
addOpenGLRunpath ${placeholder "lib"}/lib/libavcodec.so
addOpenGLRunpath ${placeholder "lib"}/lib/libavutil.so
''
# https://trac.ffmpeg.org/ticket/10809
+ optionalString (versionAtLeast version "5.0" && withVulkan) ''
patchelf $lib/lib/libavcodec.so --add-needed libvulkan.so --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]}
'';

enableParallelBuilding = true;
Expand Down