From dcd01e0d946cbf6db8166865a28e8e829191314b Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Wed, 2 Jul 2025 15:15:16 +0200 Subject: [PATCH 1/4] mlt: 7.30.0 -> 7.32.0 --- pkgs/by-name/ml/mlt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix index d1ddccffe280..41e7af71554e 100644 --- a/pkgs/by-name/ml/mlt/package.nix +++ b/pkgs/by-name/ml/mlt/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "mlt"; - version = "7.30.0"; + version = "7.32.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; tag = "v${version}"; - hash = "sha256-z1bW+hcVeMeibC1PUS5XNpbkNB+75YLoOWZC2zuDol4="; + hash = "sha256-8T5FXXGs7SxL6nD+R1Q/0Forsdp5Xux4S3VLvgqXzw8="; # The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate. # Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on # submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545 From 89d8985dffc068ad5b2195473086257b48d239ff Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Wed, 2 Jul 2025 15:16:34 +0200 Subject: [PATCH 2/4] shotcut: mlt with qt fixes text filter --- pkgs/by-name/sh/shotcut/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shotcut/package.nix b/pkgs/by-name/sh/shotcut/package.nix index 0e1d20f3e69e..4b3073f8d1c3 100644 --- a/pkgs/by-name/sh/shotcut/package.nix +++ b/pkgs/by-name/sh/shotcut/package.nix @@ -7,11 +7,11 @@ frei0r, ladspaPlugins, gettext, - mlt, jack1, pkg-config, fftw, qt6, + qt6Packages, cmake, gitUpdater, ffmpeg, @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { frei0r ladspaPlugins gettext - mlt + qt6Packages.mlt fftw qt6.qtbase qt6.qttools @@ -54,7 +54,8 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (replaceVars ./fix-mlt-ffmpeg-path.patch { - inherit mlt ffmpeg; + inherit ffmpeg; + mlt = qt6Packages.mlt; }) ]; From 47780b3415d3b004c6f7ba70e99521bd8430e930 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Wed, 2 Jul 2025 15:16:31 +0200 Subject: [PATCH 3/4] shotcut: 25.01 -> 25.08 --- pkgs/by-name/sh/shotcut/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sh/shotcut/package.nix b/pkgs/by-name/sh/shotcut/package.nix index 4b3073f8d1c3..2c79ba11180c 100644 --- a/pkgs/by-name/sh/shotcut/package.nix +++ b/pkgs/by-name/sh/shotcut/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shotcut"; - version = "25.01.25"; + version = "25.08.16"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; tag = "v${finalAttrs.version}"; - hash = "sha256-YrnmhxD7Yf2LgdEaBU4mmRdvZdO6VQ6IAb4s+V9QvLM="; + hash = "sha256-PpMfiqUwG11H+7sLkp3sLzDWjco1OxYqGyfMAFojSPU="; }; nativeBuildInputs = [ From be1ff94ea67dcdeda692068537ed0ebed04183af Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 8 Oct 2025 00:29:37 +0200 Subject: [PATCH 4/4] movit: fix darwin build --- pkgs/by-name/mo/movit/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/mo/movit/package.nix b/pkgs/by-name/mo/movit/package.nix index cbddbec7456b..7cb3d825862e 100644 --- a/pkgs/by-name/mo/movit/package.nix +++ b/pkgs/by-name/mo/movit/package.nix @@ -45,12 +45,13 @@ stdenv.mkDerivation rec { libepoxy ]; - env = { - NIX_CFLAGS_COMPILE = "-std=c++17"; # needed for latest gtest - } - // lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_LDFLAGS = "-framework OpenGL"; - }; + env = + lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-std=c++17"; # needed for latest gtest + } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_LDFLAGS = "-framework OpenGL"; + }; enableParallelBuilding = true;