From 8030c64577a7973d07537e2bb446c14ccedaa14c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 6 Feb 2023 07:25:11 +0100 Subject: [PATCH] Revert Merge #214786: libvmaf: fix build for BSD This reverts commit a55d7e3b945d04ec9d4c98d48b23377749e54003, reversing changes made to 547f6ab7a24d4a6bb2793b573911188c7f8056e4. This casused way too big rebuild and doesn't seem urgent. --- pkgs/development/libraries/libvmaf/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index c0fc4d1556f3..e7add08871a6 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, nasm }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, nasm }: stdenv.mkDerivation rec { pname = "libvmaf"; @@ -13,15 +13,6 @@ stdenv.mkDerivation rec { sourceRoot = "source/libvmaf"; - patches = [ - # Backport fix for non-Linux, non-Darwin platforms. - (fetchpatch { - url = "https://github.com/Netflix/vmaf/commit/f47640f9ffee9494571bd7c9622e353660c93fc4.patch"; - stripLen = 1; - sha256 = "rsTKuqp8VJG5DBDpixPke3LrdfjKzUO945i+iL0n7CY="; - }) - ]; - nativeBuildInputs = [ meson ninja nasm ]; mesonFlags = [ "-Denable_avx512=true" ];