nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #112680 from iblech/patch-cinelerra

Browse Source 
cinelerra: unbreak the build (make compatible with gcc10)
This commit is contained in:
Sandro 2021-02-11 03:27:34 +01:00 committed by GitHub
commit c80296971c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/applications/video/cinelerra/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool
, pkg-config, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394
, libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg
, libtiff, freetype, mjpegtools, x264, gettext, openexr
@ -10,12 +10,20 @@ stdenv.mkDerivation {
name = "cinelerra-cv-2018-05-16";
src = fetchFromGitHub {
owner = "ratopi";
repo = "CinelerraCV";
owner = "cinelerra-cv-team";
repo = "cinelerra-cv";
rev = "d9c0dbf4393717f0a42f4b91c3e1ed5b16f955dc";
sha256 = "0a8kfm1v96sv6jh4568crg6nkr6n3579i9xksfj8w199s6yxzsbk";
};
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
@ -28,10 +36,9 @@ stdenv.mkDerivation {
'';
enableParallelBuilding = true;
nativeBuildInputs = [ automake autoconf libtool pkg-config file intltool ];
buildInputs =
[ automake
autoconf libtool pkg-config file
faad2 faac
[ faad2 faac
a52dec alsaLib fftw lame libavc1394 libiec61883
libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype
mjpegtools x264 gettext openexr
@ -39,13 +46,13 @@ stdenv.mkDerivation {
libtheora libpng libdv libuuid
nasm
perl
fontconfig intltool
fontconfig
];
meta = {
meta = with lib; {
description = "Video Editor";
homepage = "http://www.cinelerra.org";
maintainers = [ lib.maintainers.marcweber ];
license = lib.licenses.gpl2;
homepage = "https://www.cinelerra.org/";
maintainers = with maintainers; [ marcweber ];
license = licenses.gpl2Only;
};
}