Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a74a5c9d9237
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0cc9ad72d46f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 29, 2020

  1. ffmpeg-full: patch for libsrt deprecated API

    @peterhoeg
    peterhoeg committed Oct 29, 2020
    Copy the full SHA
    0cc9ad7 View commit details
Showing with 9 additions and 0 deletions.
  1. +9 −0 pkgs/development/libraries/ffmpeg-full/default.nix
9 changes: 9 additions & 0 deletions pkgs/development/libraries/ffmpeg-full/default.nix
View file
Original file line number Diff line number Diff line change
@@ -244,6 +244,15 @@ stdenv.mkDerivation rec {
pname = "ffmpeg-full";
inherit (ffmpeg) src version;

# this should go away in the next release
patches = [
(fetchpatch {
url = "https://git.videolan.org/?p=ffmpeg.git;a=patch;h=7c59e1b0f285cd7c7b35fcd71f49c5fd52cf9315";
sha256 = "sha256-dqpmpDFETTuWHWolMoLaubU4BeDEuQaBNA0wmzL1f8o=";
name = "fix_libsrt.patch";
})
];

prePatch = ''
patchShebangs .
'' + stdenv.lib.optionalString stdenv.isDarwin ''