From 1cfaa9648a01e067ec1cde980ae5f782cdd1f274 Mon Sep 17 00:00:00 2001 From: BatteredBunny Date: Fri, 7 Aug 2026 14:56:07 +0300 Subject: [PATCH 1/2] synfigstudio: 1.5.3 -> 1.5.5 --- pkgs/by-name/sy/synfigstudio/package.nix | 29 +++++++++++------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/sy/synfigstudio/package.nix b/pkgs/by-name/sy/synfigstudio/package.nix index 622b7c3b7c87..e1965c97b107 100644 --- a/pkgs/by-name/sy/synfigstudio/package.nix +++ b/pkgs/by-name/sy/synfigstudio/package.nix @@ -6,34 +6,35 @@ autoreconfHook, wrapGAppsHook3, - boost, cairo, + ffmpeg, gettext, glibmm, + libmng, gtk3, gtkmm3, libjack2, libsigcxx, libxmlxx, mlt, - pango, imagemagick, intltool, adwaita-icon-theme, harfbuzz, freetype, + fontconfig, fribidi, openexr, fftw, }: let - version = "1.5.3"; + version = "1.5.5"; src = fetchFromGitHub { owner = "synfig"; repo = "synfig"; rev = "v${version}"; - hash = "sha256-D+FUEyzJ74l0USq3V9HIRAfgyJfRP372aEKDqF8+hsQ="; + hash = "sha256-5jVd+YqHVHKkePXBb3zjXEVlgdlU6Yb6LC4CurvsBtE="; }; ETL = stdenv.mkDerivation { @@ -46,9 +47,6 @@ let pkg-config autoreconfHook ]; - buildInputs = [ - glibmm - ]; }; synfig = stdenv.mkDerivation { @@ -57,11 +55,7 @@ let sourceRoot = "${src.name}/synfig-core"; - configureFlags = [ - "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.out}/lib" - ] - ++ lib.optionals stdenv.cc.isClang [ + configureFlags = lib.optionals stdenv.cc.isClang [ # Newer versions of clang default to C++17, but synfig and some of its dependencies use deprecated APIs that # are removed in C++17. Setting the language version to C++14 allows it to build. "CXXFLAGS=-std=c++14" @@ -74,22 +68,23 @@ let autoreconfHook gettext intltool + imagemagick ]; buildInputs = [ ETL - boost - cairo glibmm mlt libsigcxx libxmlxx - pango imagemagick harfbuzz freetype + fontconfig fribidi openexr fftw + ffmpeg + libmng ]; }; in @@ -119,11 +114,11 @@ stdenv.mkDerivation { gettext intltool wrapGAppsHook3 + synfig ]; buildInputs = [ ETL synfig - boost cairo glibmm gtk3 @@ -133,6 +128,8 @@ stdenv.mkDerivation { libsigcxx libxmlxx mlt + fontconfig + ffmpeg adwaita-icon-theme openexr fftw From 918890bb6d33315fb70cb8d5f6e5d12a5fe7646e Mon Sep 17 00:00:00 2001 From: BatteredBunny Date: Fri, 7 Aug 2026 15:04:24 +0300 Subject: [PATCH 2/2] synfigstudio: modernize --- pkgs/by-name/sy/synfigstudio/package.nix | 26 ++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sy/synfigstudio/package.nix b/pkgs/by-name/sy/synfigstudio/package.nix index e1965c97b107..14b0d30d1d3f 100644 --- a/pkgs/by-name/sy/synfigstudio/package.nix +++ b/pkgs/by-name/sy/synfigstudio/package.nix @@ -5,6 +5,7 @@ pkg-config, autoreconfHook, wrapGAppsHook3, + gitUpdater, cairo, ffmpeg, @@ -37,24 +38,30 @@ let hash = "sha256-5jVd+YqHVHKkePXBb3zjXEVlgdlU6Yb6LC4CurvsBtE="; }; - ETL = stdenv.mkDerivation { + ETL = stdenv.mkDerivation (finalAttrs: { pname = "ETL"; inherit version src; sourceRoot = "${src.name}/ETL"; + __structuredAttrs = true; + strictDeps = true; + nativeBuildInputs = [ pkg-config autoreconfHook ]; - }; + }); - synfig = stdenv.mkDerivation { + synfig = stdenv.mkDerivation (finalAttrs: { pname = "synfig"; inherit version src; sourceRoot = "${src.name}/synfig-core"; + __structuredAttrs = true; + strictDeps = true; + configureFlags = lib.optionals stdenv.cc.isClang [ # Newer versions of clang default to C++17, but synfig and some of its dependencies use deprecated APIs that # are removed in C++17. Setting the language version to C++14 allows it to build. @@ -86,14 +93,17 @@ let ffmpeg libmng ]; - }; + }); in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "synfigstudio"; inherit version src; sourceRoot = "${src.name}/synfig-studio"; + __structuredAttrs = true; + strictDeps = true; + postPatch = '' patchShebangs images/splash_screen_development.sh ''; @@ -140,13 +150,17 @@ stdenv.mkDerivation { passthru = { # Expose libraries and cli tools inherit ETL synfig; + + updateScript = gitUpdater { rev-prefix = "v"; }; }; meta = { description = "2D animation program"; homepage = "https://www.synfig.org"; + changelog = "https://github.com/synfig/synfig/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; + mainProgram = "synfigstudio"; maintainers = [ ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +})