diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e /nixpkgs/pkgs/development/libraries/mlt | |
parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mlt')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/mlt/qt-5.nix | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix index f8724703f049..948de303cefa 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, cmake , SDL , ffmpeg , frei0r @@ -26,13 +27,13 @@ mkDerivation rec { pname = "mlt"; - version = "6.24.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "1my43ica2qax2622307dv4gn3w8hkchy643i9pq8r9yh2hd4pvs9"; + sha256 = "13c5miph9jjbz69dhy0zvbkk5zbb05dr3vraaci0d5fdbrlhyscf"; }; buildInputs = [ @@ -56,42 +57,15 @@ mkDerivation rec { ladspaPlugins ]; - nativeBuildInputs = [ which ]; + nativeBuildInputs = [ cmake which ]; outputs = [ "out" "dev" ]; - # 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-gpl3" - "--enable-opengl" - ]; - - # mlt is unable to cope with our multi-prefix Qt build - # because it does not use CMake or qmake. - NIX_CFLAGS_COMPILE = "-I${lib.getDev qtsvg}/include/QtSvg"; - - CXXFLAGS = "-std=c++11"; - qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" ]; - postInstall = '' - # Remove an unnecessary reference to movit.dev. - s=${movit.dev}/include - t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) - sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g" - - # Remove an unnecessary reference to movit.dev. - s=${qtbase.dev}/include - t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) - sed -i $out/lib/mlt/libmltqt.so -e "s|$s|$t|g" - ''; - passthru = { inherit ffmpeg; }; |