Merge pull request #136395 from acowley/frei0r

frei0r-plugins: 1.6.1 -> 1.7.0
This commit is contained in:
Bernardo Meurer 2021-09-03 11:44:01 -07:00 committed by GitHub
commit f30cbbc182
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,16 +1,26 @@
{ lib, stdenv, fetchurl, autoconf, cairo, opencv, pkg-config }:
{ lib, stdenv, fetchurl, fetchpatch, cairo, cmake, opencv, pcre, pkg-config }:
stdenv.mkDerivation rec {
pname = "frei0r-plugins";
version = "1.6.1";
version = "1.7.0";
src = fetchurl {
url = "https://files.dyne.org/frei0r/releases/${pname}-${version}.tar.gz";
sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0";
hash = "sha256-Gx/48Pm8I+7XJOlOmnwdjwJEv+M0JLtP5o5kYMCIUjo=";
};
nativeBuildInputs = [ autoconf pkg-config ];
buildInputs = [ cairo opencv ];
# A PR to add support for OpenCV 4 was merged in May 2020. This
# patch can be removed when a release beyond 1.7.0 is issued.
patches = [
(fetchpatch {
name = "opencv4-support.patch";
url = "https://github.com/dyne/frei0r/commit/c0c8eed79fc8abe6c9881a53d7391efb526a3064.patch";
sha256 = "sha256-qxUAui4EEBEj8M/SoyMUkj//KegMTTT6FTBDC/Chxz4=";
})
];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ cairo opencv pcre ];
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
for f in $out/lib/frei0r-1/*.so* ; do