diff options
| author | Domen Kožar <domen@dev.si> | 2014-12-07 14:02:48 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-12-07 14:02:48 +0100 |
| commit | 4aa3eec330f64afd9db78b9bb26db32bdbabe2c4 (patch) | |
| tree | 90cb19f6cfb8498dff0597a7ae2968b240b1e559 /pkgs/applications/video | |
| parent | 43c4d78bc6e19476c122efc82316122722e988aa (diff) | |
| parent | ad4ad11fbc8871811d65d0b2427fd4bc38e54a14 (diff) | |
| download | nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.gz nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.bz2 nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.lz nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.xz nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.zst nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.zip | |
Merge branch 'master' into staging
Conflicts: pkgs/development/libraries/fontconfig/default.nix
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/cinelerra/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 8287cb9121ea..94ec79e70d67 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -4,7 +4,7 @@ , libtiff, freetype, mjpegtools, x264, gettext, openexr , libXext, libXxf86vm, libXv, libXi, libX11, xextproto, libtheora, libpng , libdv, libuuid, file, nasm, perl }: - + stdenv.mkDerivation { name = "cinelerra-git"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { # # END src = fetchgit { - url = "git://git.cinelerra.org/j6t/cinelerra.git"; + url = "git://git.cinelerra-cv.org/j6t/cinelerra.git"; rev = "01dc4375a0fb65d10dd95151473d0e195239175f"; sha256 = "afb406a5637e4d0afad94e62ffd3af5b61e39f75aba9c08521523d00a0a5fec5"; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation { perl ]; - meta = { + meta = { description = "Video Editor"; homepage = http://www.cinelerra.org; maintainers = [ stdenv.lib.maintainers.marcweber ]; |