Skip to content

Commit

Permalink
python3Packages.av: 11.0.0 -> 12.2.0
Browse files Browse the repository at this point in the history
Pin FFmpeg to 6.x as upstream doesn’t even support 5.x any
more. Unfortunately 7.x support is not yet there; I might have to
handle it myself when we drop 6.
  • Loading branch information
emilazy committed Jul 14, 2024
1 parent aef28c7 commit ca258d2
Showing 1 changed file with 4 additions and 14 deletions.
18 changes: 4 additions & 14 deletions pkgs/development/python-modules/av/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
buildPythonPackage,
cython,
fetchFromGitHub,
fetchpatch,
ffmpeg_5-headless,
ffmpeg_6-headless,
numpy,
pillow,
pkg-config,
Expand All @@ -16,7 +15,7 @@

buildPythonPackage rec {
pname = "av";
version = "11.0.0";
version = "12.2.0";
pyproject = true;

disabled = pythonOlder "3.7";
Expand All @@ -25,25 +24,16 @@ buildPythonPackage rec {
owner = "mikeboers";
repo = "PyAV";
rev = "refs/tags/v${version}";
hash = "sha256-pCKP+4ZmZCJcG7/Qy9H6aS4svQdgaRA9S1QVNWFYhSQ=";
hash = "sha256-yPVAtL71pL/ok3bli+r/IruCrmmhNyv98pr7z3m8sbo=";
};

patches = [
# merged upstream PR: https://github.com/PyAV-Org/PyAV/pull/1387
(fetchpatch {
name = "use-pkg-config-env-var-fix-cross.patch";
url = "https://github.com/PyAV-Org/PyAV/commit/ba7a2c9f716af506838d399e6ed27ed6d64d2435.patch";
sha256 = "sha256-oH+g8sVoVCQe6DimRN38VT2GdziriwHYRAhldNxz9/E=";
})
];

nativeBuildInputs = [
cython
pkg-config
setuptools
];

buildInputs = [ ffmpeg_5-headless ];
buildInputs = [ ffmpeg_6-headless ];

preCheck = ''
# ensure we import the built version
Expand Down

0 comments on commit ca258d2

Please sign in to comment.