From b28253f5185ee6c94458fa107c013380de26bc6a Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 5 Oct 2025 13:00:54 +0200 Subject: [PATCH 1/2] rlottie: build with meson This works around rlottie not supporting CMake 4, and at the same time drops some additional flags. While some CMake metadata files are now missing, dependents should use pkg-config to find rlottie anyways. --- pkgs/by-name/rl/rlottie/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/rl/rlottie/package.nix b/pkgs/by-name/rl/rlottie/package.nix index 6b4c19bbbddd..14d30ab20d8c 100644 --- a/pkgs/by-name/rl/rlottie/package.nix +++ b/pkgs/by-name/rl/rlottie/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, fetchpatch, - cmake, + meson, ninja, pkg-config, }: @@ -28,15 +28,11 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - cmake + meson ninja pkg-config ]; - cmakeFlags = [ - (lib.cmakeFeature "LIB_INSTALL_DIR" "${placeholder "out"}/lib") - ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString ( stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 ) "-U__ARM_NEON__"; From ab01c588b514838c539400de10d560b7e58a6117 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 6 Oct 2025 10:36:43 +0200 Subject: [PATCH 2/2] rlottie: 0.2 -> unstable-20251001 --- pkgs/by-name/rl/rlottie/package.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/rl/rlottie/package.nix b/pkgs/by-name/rl/rlottie/package.nix index 14d30ab20d8c..54c0ac6a5d88 100644 --- a/pkgs/by-name/rl/rlottie/package.nix +++ b/pkgs/by-name/rl/rlottie/package.nix @@ -8,25 +8,17 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rlottie"; - version = "0.2"; + version = "0.2-unstable-2025-10-01"; src = fetchFromGitHub { owner = "Samsung"; repo = "rlottie"; - rev = "v${version}"; - sha256 = "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3"; + rev = "671c561130ead1c6e44805a7ec1263573a3440fd"; + hash = "sha256-od3zatv4ZxUIoLkwy0TT8lAsDcjoPS4plci+ZDyz34Y="; }; - patches = [ - # Fixed build with GCC 11 - (fetchpatch { - url = "https://github.com/Samsung/rlottie/commit/2d7b1fa2b005bba3d4b45e8ebfa632060e8a157a.patch"; - hash = "sha256-2JPsj0WiBMMu0N3NUYDrHumvPN2YS8nPq5Zwagx6UWE="; - }) - ]; - nativeBuildInputs = [ meson ninja