diff options
| author | Florian Friesdorf <flo@chaoflow.net> | 2011-06-22 22:23:45 +0000 |
|---|---|---|
| committer | Florian Friesdorf <flo@chaoflow.net> | 2011-06-22 22:23:45 +0000 |
| commit | 200101c7b0a1bbbcf742f59e8d5686f1babe7670 (patch) | |
| tree | ac2f417332dcc9493945b65853d4baa967cfeded /pkgs | |
| parent | 054178e045dd820f3ce271513c73326f4140ea22 (diff) | |
| download | nixlib-200101c7b0a1bbbcf742f59e8d5686f1babe7670.tar nixlib-200101c7b0a1bbbcf742f59e8d5686f1babe7670.tar.gz nixlib-200101c7b0a1bbbcf742f59e8d5686f1babe7670.tar.bz2 nixlib-200101c7b0a1bbbcf742f59e8d5686f1babe7670.tar.lz nixlib-200101c7b0a1bbbcf742f59e8d5686f1babe7670.tar.xz nixlib-200101c7b0a1bbbcf742f59e8d5686f1babe7670.tar.zst nixlib-200101c7b0a1bbbcf742f59e8d5686f1babe7670.zip | |
cinelerra-git: switched to fetchgit
svn path=/nixpkgs/trunk/; revision=27526
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/cinelerra/default.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 58a84d91b83e..2919e630361b 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sourceFromHead, autoconf, automake, libtool +{ stdenv, fetchgit, sourceFromHead, autoconf, automake, libtool , pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr, esound @@ -8,12 +8,18 @@ stdenv.mkDerivation { name = "cinelerra-git"; - # REGION AUTO UPDATE: { name="cinelerra"; type="git"; url="git://git.cinelerra.org/j6t/cinelerra.git"; } - src= sourceFromHead "cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"; sha256 = "0b264e2a770d2257550c9a23883a060afcaff12293fe43828954e7373f5f4fb4"; }); - # END + # # REGION AUTO UPDATE: { name="cinelerra"; type="git"; url="git://git.cinelerra.org/j6t/cinelerra.git"; } + # src= sourceFromHead "cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz" + # (fetchurl { url = "http://mawercer.de/~nix/repos/cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"; sha256 = "0b264e2a770d2257550c9a23883a060afcaff12293fe43828954e7373f5f4fb4"; }); + # # END - # touch confi.rpath: work around bug in automake 1.10 ? + src = fetchgit { + url = "git://git.cinelerra.org/j6t/cinelerra.git"; + rev = "01dc4375a0fb65d10dd95151473d0e195239175f"; + sha256 = "afb406a5637e4d0afad94e62ffd3af5b61e39f75aba9c08521523d00a0a5fec5"; + }; + + # 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 |