diff --git a/pkgs/development/libraries/mlt/qt-5.4.nix b/pkgs/development/libraries/mlt/qt-5.4.nix deleted file mode 100644 index 6f308a20fdc..00000000000 --- a/pkgs/development/libraries/mlt/qt-5.4.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate -, libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt5, sox -}: - -stdenv.mkDerivation rec { - name = "mlt-${version}"; - version = "0.9.8"; - - src = fetchurl { - url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; - sha256 = "0x0hsb05i7g70dh3jll41qlvcylailfgsr0y1dpx7hyigynxc50j"; - }; - - buildInputs = [ - SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 - makeWrapper movit pkgconfig qt5.base qt5.svg sox - ]; - - # Mostly taken from: - # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine - configureFlags = [ - "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3" - "--enable-opengl" - ]; - - enableParallelBuilding = true; - - postInstall = '' - wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 - ''; - - meta = with stdenv.lib; { - description = "Open source multimedia framework, designed for television broadcasting"; - homepage = http://www.mltframework.org/; - license = licenses.gpl3; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/mlt/qt-5.5.nix b/pkgs/development/libraries/mlt/qt-5.nix similarity index 100% rename from pkgs/development/libraries/mlt/qt-5.5.nix rename to pkgs/development/libraries/mlt/qt-5.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c233bc2e1f9..7ceba860e84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7812,8 +7812,6 @@ let qt = qt4; }; - mlt-qt5 = callPackage ../development/libraries/mlt/qt-5.4.nix { }; - movit = callPackage ../development/libraries/movit { }; mosquitto = callPackage ../servers/mqtt/mosquitto { }; @@ -8167,7 +8165,7 @@ let libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; - mlt = callPackage ../development/libraries/mlt/qt-5.5.nix {}; + mlt = callPackage ../development/libraries/mlt/qt-5.nix {}; openbr = callPackage ../development/libraries/openbr { }; @@ -15809,6 +15807,7 @@ aliases = with self; rec { libtidy = html-tidy; # added 2014-12-21 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 + mlt-qt5 = qt5.mlt; # added 2015-12-19 nfsUtils = nfs-utils; # added 2014-12-06 quassel_qt5 = kde5.quassel_qt5; # added 2015-09-30 quasselClient_qt5 = kde5.quasselClient_qt5; # added 2015-09-30