diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-07-31 12:47:17 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-07-31 12:52:29 +0200 |
| commit | 62d0a320b32539a6b9efa868183f27f215aa2917 (patch) | |
| tree | 45b9d3fa78640bb0a3591f1a9efb12970690836b /pkgs/development/libraries/mlt | |
| parent | 10d4f1fac7da3e295d9185bbf41bacb760a6be4f (diff) | |
| download | nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar.gz nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar.bz2 nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar.lz nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar.xz nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.tar.zst nixpkgs-62d0a320b32539a6b9efa868183f27f215aa2917.zip | |
Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d98544ab37741f740dd3516023924b27. Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'. Q: What's the difference between Jack1 and Jack2? A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
Diffstat (limited to 'pkgs/development/libraries/mlt')
| -rw-r--r-- | pkgs/development/libraries/mlt/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 3d89d6c7d55..00d586a9f04 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, frei0r, jackaudio, libav, libdv, libsamplerate +{ stdenv, fetchurl, SDL, frei0r, jack2, libav, libdv, libsamplerate , libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - SDL frei0r jackaudio libav libdv libsamplerate libvorbis libxml2 + SDL frei0r jack2 libav libdv libsamplerate libvorbis libxml2 makeWrapper movit pkgconfig qt sox ]; |