diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-10-13 13:31:33 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-10-13 13:31:33 +0200 |
| commit | b5697c6954d4b261d354cb6630385fe280f15ef9 (patch) | |
| tree | 8a5e980a04ed17523547303988c6dc58e0c9027e /pkgs/applications/video | |
| parent | 26ec15c267d8ddc193dbb05aa8f98928518176d9 (diff) | |
| parent | 7818f30cc4b6b282ecd361a5e62d1c99ec8c0c78 (diff) | |
| download | nixpkgs-b5697c6954d4b261d354cb6630385fe280f15ef9.tar nixpkgs-b5697c6954d4b261d354cb6630385fe280f15ef9.tar.gz nixpkgs-b5697c6954d4b261d354cb6630385fe280f15ef9.tar.bz2 nixpkgs-b5697c6954d4b261d354cb6630385fe280f15ef9.tar.lz nixpkgs-b5697c6954d4b261d354cb6630385fe280f15ef9.tar.xz nixpkgs-b5697c6954d4b261d354cb6630385fe280f15ef9.tar.zst nixpkgs-b5697c6954d4b261d354cb6630385fe280f15ef9.zip | |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1548439
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/cinelerra/default.nix | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index eb3946b9ed0..36ad39bd37c 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, automake, libtool +{ stdenv, fetchFromGitHub, autoconf, automake, libtool , pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr @@ -7,22 +7,27 @@ , fontconfig, intltool }: stdenv.mkDerivation { - name = "cinelerra-unstable-2016-01-12"; + name = "cinelerra-cv-2018-05-16"; - src = fetchgit { - url = "git://git.cinelerra-cv.org/j6t/cinelerra.git"; - rev = "454be60e201c18c1fc3f1f253a6d2184fcfc94c4"; - sha256 = "1n4kshqhgnr7aivsi8dgx48phyd2nzvv4szbc82mndklvs9jfb7r"; + src = fetchFromGitHub { + owner = "ratopi"; + repo = "CinelerraCV"; + rev = "d9c0dbf4393717f0a42f4b91c3e1ed5b16f955dc"; + 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 @@ -37,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; |