diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
| commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
| tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/applications/video/handbrake/default.nix | |
| parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
| parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
| download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/video/handbrake/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/video/handbrake/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/applications/video/handbrake/default.nix b/nixpkgs/pkgs/applications/video/handbrake/default.nix index 483d165f947b..54216cf73ad6 100644 --- a/nixpkgs/pkgs/applications/video/handbrake/default.nix +++ b/nixpkgs/pkgs/applications/video/handbrake/default.nix @@ -10,6 +10,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch # For tests , testers , runCommand @@ -135,6 +136,11 @@ let "${src}/contrib/ffmpeg/A28-avcodec-amfenc-HDR-metadata.patch" # This patch is not applying since ffmpeg 5.1.1, probably it was backported by upstream # "${src}/contrib/ffmpeg/A30-svt-av1-backports.patch" + (fetchpatch { + name = "vulkan-remove-extensions.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/eb0455d64690"; + hash = "sha256-qvLrb7b+9/bel8A2lZuSmBiJtHXsABw0Lvgn1ggnmCU="; + }) ]; }); |