From f452b45052af4feddc958a503883ab23f802c11c Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 12 Oct 2019 15:43:33 +0200 Subject: [PATCH] cinelerra: streamline build --- pkgs/applications/video/cinelerra/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 42d3b387320..36ad39bd37c 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -7,7 +7,7 @@ , fontconfig, intltool }: stdenv.mkDerivation { - name = "cinelerra-unstable-2018-05-16"; + name = "cinelerra-cv-2018-05-16"; src = fetchFromGitHub { owner = "ratopi"; @@ -16,14 +16,18 @@ stdenv.mkDerivation { sha256 = "0a8kfm1v96sv6jh4568crg6nkr6n3579i9xksfj8w199s6yxzsbk"; }; - # touch config.rpath: work around bug in automake 1.10 ? preConfigure = '' find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@${perl}/bin/perl@" -i - touch config.rpath ./autogen.sh sed -i -e "s@/usr/bin/file@${file}/bin/file@" ./configure ''; + ## fix bug with parallel building + preBuild = '' + make -C cinelerra versioninfo.h + ''; + enableParallelBuilding = true; + buildInputs = [ automake autoconf libtool pkgconfig file @@ -38,10 +42,6 @@ stdenv.mkDerivation { fontconfig intltool ]; - # $ make -C cinelerra edl.o - # edl.C:50:25: fatal error: versioninfo.h: No such file or directory - enableParallelBuilding = false; - meta = { description = "Video Editor"; homepage = http://www.cinelerra.org;