diff options
| author | Cillian de Roiste <cillian.deroiste@gmail.com> | 2012-06-05 16:52:11 +0000 |
|---|---|---|
| committer | Cillian de Roiste <cillian.deroiste@gmail.com> | 2012-06-05 16:52:11 +0000 |
| commit | 1067f51f924fc707022510837c07e5864f4d851a (patch) | |
| tree | d949b94e145c7b4ea3f522780bddd87914eeda66 /pkgs | |
| parent | 73a1d5e27face256c81af586de52b0062b5ce948 (diff) | |
| download | nixpkgs-1067f51f924fc707022510837c07e5864f4d851a.tar nixpkgs-1067f51f924fc707022510837c07e5864f4d851a.tar.gz nixpkgs-1067f51f924fc707022510837c07e5864f4d851a.tar.bz2 nixpkgs-1067f51f924fc707022510837c07e5864f4d851a.tar.lz nixpkgs-1067f51f924fc707022510837c07e5864f4d851a.tar.xz nixpkgs-1067f51f924fc707022510837c07e5864f4d851a.tar.zst nixpkgs-1067f51f924fc707022510837c07e5864f4d851a.zip | |
Updating Kdenlive to 0.9.2, and also updating mlt to 0.8.0 since it's a dependency
svn path=/nixpkgs/trunk/; revision=34362
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/kdenlive/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/development/libraries/mlt/default.nix | 18 |
2 files changed, 21 insertions, 16 deletions
diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index c133c90f8e9..d8620eb33cd 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, mlt, gettext -, qimageblitz, qjson, shared_mime_info, soprano, pkgconfig }: +{ stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon +, mlt, gettext , qimageblitz, qjson, shared_mime_info, soprano +, pkgconfig }: stdenv.mkDerivation rec { name = "kdenlive-${version}"; - version = "0.8.2.1"; + version = "0.9.2"; src = fetchurl { - url = "mirror://sourceforge/kdenlive/${name}.tar.gz"; - sha256 = "a454a0659c9673453800df8382dfdbcb87acfb9b174712ffeb46b8304bf00717"; + url = "mirror://kde/stable/kdenlive/0.9.2/src/${name}.tar.bz2"; + sha256 = "1h240s0c10z8sgvwmrfzam33qlx7j2a5b12lw1mk02ihs9hl43j1"; }; - patches = [ ./qtgl-header-change.patch ]; - - buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext - qimageblitz qjson shared_mime_info soprano pkgconfig ]; + buildInputs = + [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext qimageblitz + qjson shared_mime_info soprano pkgconfig + ]; meta = { description = "Free and open source video editor"; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 1740de118a4..640bc7edc32 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,15 +1,19 @@ -{stdenv, fetchurl, SDL, qt4, pkgconfig, ffmpeg, libdv, libxml2, libsamplerate, -libvorbis, sox}: +{ stdenv, fetchurl, SDL, ffmpeg, libdv, libsamplerate, libvorbis +, libxml2 , pkgconfig, qt4, sox }: -stdenv.mkDerivation { - name = "mlt-0.7.8"; +stdenv.mkDerivation rec { + name = "mlt-${version}"; + version = "0.8.0"; src = fetchurl { - url = mirror://sourceforge/mlt/mlt-0.7.8.tar.gz; - sha256 = "0hvfjk0hspamym0ahi635ivx9iv3v2jy2qv15za1vmz28qkkp0wm"; + url = "mirror://sourceforge/mlt/${name}.tar.gz"; + sha256 = "1pf61imb5xzgzf65g54kybjr67235rxi20691023mcv34qwppl3v"; }; - buildInputs = [ qt4 SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox pkgconfig ]; + buildInputs = + [ SDL ffmpeg libdv libsamplerate libvorbis libxml2 pkgconfig qt4 + sox + ]; # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine |