Merge pull request #124552 from risicle/ris-mat2-test-fix

python3Packages.mat2: fix tests against ffmpeg 4.4
3 years ago · 023bd08672
parent 4d77eeb3a1 6d8b59ab30
commit 023bd08672
1 changed files with 7 additions and 0 deletions
--- a/pkgs/development/python-modules/mat2/default.nix
+++ b/pkgs/development/python-modules/mat2/default.nix
@ -3,6 +3,7 @@
 , python
 , pythonOlder
 , fetchFromGitLab
+, fetchpatch
 , substituteAll
 , bubblewrap
 , exiftool
@ -49,6 +50,12 @@ buildPythonPackage rec {
    ./executable-name.patch
    # hardcode path to mat2 executable
    ./tests.patch
+    # remove for next release
+    (fetchpatch {
+      name = "fix-tests-ffmpeg-4.4.patch";
+      url = "https://0xacab.org/jvoisin/mat2/-/commit/c9be50f968212b01f8d8ad85e59e19c3e67d8578.patch";
+      sha256 = "0895dkv6575ps3drdfnli15cggx27n9irjx0axigrm4ql4ma0648";
+    })
  ];

  postPatch = ''