diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-08 17:57:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-13 11:31:47 +0000 |
| commit | ee7984efa14902a2ddd820c937457667a4f40c6a (patch) | |
| tree | c9c1d046733cefe5e21fdd8a52104175d47b2443 /nixpkgs/pkgs/development/libraries/frei0r | |
| parent | ffc9d4ba381da62fd08b361bacd1e71e2a3d934d (diff) | |
| parent | b3c692172e5b5241b028a98e1977f9fb12eeaf42 (diff) | |
| download | nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.gz nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.bz2 nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.lz nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.xz nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.zst nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.zip | |
Merge commit 'b3c692172e5b5241b028a98e1977f9fb12eeaf42'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/frei0r')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/frei0r/default.nix | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/frei0r/default.nix b/nixpkgs/pkgs/development/libraries/frei0r/default.nix index c4f993462964..ac2c43ce8dbb 100644 --- a/nixpkgs/pkgs/development/libraries/frei0r/default.nix +++ b/nixpkgs/pkgs/development/libraries/frei0r/default.nix @@ -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 |