diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index e0249f6d0b2..c81811ea937 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkg-config, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr @@ -7,23 +7,15 @@ , fontconfig, intltool }: stdenv.mkDerivation { - name = "cinelerra-cv-2018-05-16"; + name = "cinelerra-cv-2021-02-14"; src = fetchFromGitHub { owner = "cinelerra-cv-team"; repo = "cinelerra-cv"; - rev = "d9c0dbf4393717f0a42f4b91c3e1ed5b16f955dc"; - sha256 = "0a8kfm1v96sv6jh4568crg6nkr6n3579i9xksfj8w199s6yxzsbk"; + rev = "7d0e8ede557d0cdf3606e0a8d97166a22f88d89e"; + sha256 = "0n84y2wp47y89drc48cm1609gads5c6saw6c6bqcf5c5wcg1yfbj"; }; - patches = [ - # avoid gcc10 error about narrowing - (fetchpatch { - url = "https://github.com/cinelerra-cv-team/cinelerra-cv/pull/2/commits/a1b2d9c3bd5730ec0284894f3d81892af3e77f1f.patch"; - sha256 = "1cjyv1m174dblpa1bs5dggk24h4477zqvc5sbfc0m5rpkndx5ycp"; - }) - ]; - preConfigure = '' find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@${perl}/bin/perl@" -i ./autogen.sh @@ -50,8 +42,8 @@ stdenv.mkDerivation { ]; meta = with lib; { - description = "Video Editor"; - homepage = "https://www.cinelerra.org/"; + description = "Professional video editing and compositing environment (community version)"; + homepage = "http://cinelerra-cv.wikidot.com/"; maintainers = with maintainers; [ marcweber ]; license = licenses.gpl2Only; };