From e12fdc26c6459ced28b5813106fcab119d678396 Mon Sep 17 00:00:00 2001 From: Philipp Mildenberger Date: Fri, 12 May 2023 16:05:15 +0200 Subject: frei0r: 1.7.0 -> 1.8.0, fix/add cudaSupport (#226666) Co-authored-by: Sandro --- pkgs/development/libraries/frei0r/default.nix | 39 ++++++++++++++++----------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index ac2c43ce8db..dbf5b9c2373 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -1,26 +1,34 @@ -{ lib, stdenv, fetchurl, fetchpatch, cairo, cmake, opencv, pcre, pkg-config }: +{ lib +, config +, stdenv +, fetchurl +, cairo +, cmake +, opencv +, pcre +, pkg-config +, cudaSupport ? config.cudaSupport or false +, cudaPackages +}: stdenv.mkDerivation rec { pname = "frei0r-plugins"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { url = "https://files.dyne.org/frei0r/releases/${pname}-${version}.tar.gz"; - hash = "sha256-Gx/48Pm8I+7XJOlOmnwdjwJEv+M0JLtP5o5kYMCIUjo="; + hash = "sha256-RaKGVcrwVyJ7RCuADKOJnpNJBRXIHiEtIZ/fSnYT9cQ="; }; - # 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 ]; + buildInputs = [ + cairo + opencv + pcre + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart + cudaPackages.cuda_nvcc + ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $out/lib/frei0r-1/*.so* ; do @@ -31,9 +39,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://frei0r.dyne.org"; description = "Minimalist, cross-platform, shared video plugins"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux ++ platforms.darwin; - }; } -- cgit 1.4.1