removing old bleeding edge cruft replacing it by a niftier version using

source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.

sourceByName is called sourceFromHead now.

updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update

svn path=/nixpkgs/trunk/; revision=18894

1 files changed, 11 insertions, 3 deletions

diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix
index 2029c98037f..7d8b2dca272 100644
--- a/pkgs/applications/video/cinelerra/default.nix
+++ b/pkgs/applications/video/cinelerra/default.nix
@@ -1,25 +1,32 @@
 args:
+with args;
 args.stdenv.mkDerivation {
   name = "cinelerra-git";
 
-  src = args.sourceByName "cinelerra";
+  # 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
 
   perl = args.perl;
 
+  # touch confi.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
     '';
   configureOptions = ["--enable-freetype2"];
 
   buildInputs =(with args; [
-      automake autoconf libtool pkgconfig
+      automake
+      autoconf libtool pkgconfig
       faad2 faac
       a52dec alsaLib   fftw lame libavc1394 libiec61883
       libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype
       mjpegtools x264 gettext openexr esound 
       #
-      libXxf86vm libXv
+      libXxf86vm libXv libXi libX11 xextproto
       libtheora libpng libdv
       nasm
       perl
@@ -29,6 +36,7 @@ args.stdenv.mkDerivation {
   meta = { 
       description = "Cinelerra - Video Editor";
       homepage = http://www.cinelerra.org;
+      maintainers = [lib.maintainers.marcweber];
       license = "GPLv2";
   };
 }