pyrox.dev
Merge pull request #136395 from acowley/frei0r
frei0r-plugins: 1.6.1 -> 1.7.0
authored by Bernardo Meurer and committed by GitHub f30cbbc1 aa08f65d
+15
-5
pkgs/development/libraries/frei0r/default.nix
+15
-5
pkgs/development/libraries/frei0r/default.nix
···
1
-
{ lib, stdenv, fetchurl, autoconf, cairo, opencv, pkg-config }:
1
+
{ lib, stdenv, fetchurl, fetchpatch, cairo, cmake, opencv, pcre, pkg-config }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "frei0r-plugins";
5
-
version = "1.6.1";
5
+
version = "1.7.0";
6
6
7
7
src = fetchurl {
8
8
url = "https://files.dyne.org/frei0r/releases/${pname}-${version}.tar.gz";
9
-
sha256 = "0pji26fpd0dqrx1akyhqi6729s394irl73dacnyxk58ijqq4dhp0";
9
+
hash = "sha256-Gx/48Pm8I+7XJOlOmnwdjwJEv+M0JLtP5o5kYMCIUjo=";
10
10
};
11
11
12
-
nativeBuildInputs = [ autoconf pkg-config ];
13
-
buildInputs = [ cairo opencv ];
12
+
# A PR to add support for OpenCV 4 was merged in May 2020. This
13
+
# patch can be removed when a release beyond 1.7.0 is issued.
14
+
patches = [
15
+
(fetchpatch {
16
+
name = "opencv4-support.patch";
17
+
url = "https://github.com/dyne/frei0r/commit/c0c8eed79fc8abe6c9881a53d7391efb526a3064.patch";
18
+
sha256 = "sha256-qxUAui4EEBEj8M/SoyMUkj//KegMTTT6FTBDC/Chxz4=";
19
+
})
20
+
];
21
+
22
+
nativeBuildInputs = [ cmake pkg-config ];
23
+
buildInputs = [ cairo opencv pcre ];
14
24
15
25
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
16
26
for f in $out/lib/frei0r-1/*.so* ; do