From a6c5e2fbfe72db923e362093ef4599f694b9e754 Mon Sep 17 00:00:00 2001 From: leiserfg Date: Sun, 12 Oct 2025 18:23:13 +0200 Subject: [PATCH] libresprite: fix build with cmake 4 --- pkgs/by-name/li/libresprite/cmake4.diff | 23 +++++++++++++++++++++++ pkgs/by-name/li/libresprite/package.nix | 6 ++++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/li/libresprite/cmake4.diff diff --git a/pkgs/by-name/li/libresprite/cmake4.diff b/pkgs/by-name/li/libresprite/cmake4.diff new file mode 100644 index 000000000000..23b59ba020dd --- /dev/null +++ b/pkgs/by-name/li/libresprite/cmake4.diff @@ -0,0 +1,23 @@ +diff --git i/emscripten/CMakeLists.txt w/emscripten/CMakeLists.txt +index 7c6ea6a0e..b53a4b6cc 100644 +--- i/emscripten/CMakeLists.txt ++++ w/emscripten/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.4.1) ++cmake_minimum_required(VERSION 3.10) + project(LibreSprite C CXX) + set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + set(CMAKE_CXX_STANDARD 20) +diff --git i/third_party/observable/CMakeLists.txt w/third_party/observable/CMakeLists.txt +index 3ef458975..4d1f186dc 100644 +--- i/third_party/observable/CMakeLists.txt ++++ w/third_party/observable/CMakeLists.txt +@@ -1,7 +1,7 @@ + # Observable Library + # Copyright (C) 2016-2021 David Capello + +-cmake_minimum_required(VERSION 3.2) ++cmake_minimum_required(VERSION 3.10) + + project(observable CXX) + option(OBSERVABLE_TESTS "Compile observable tests" ON) diff --git a/pkgs/by-name/li/libresprite/package.nix b/pkgs/by-name/li/libresprite/package.nix index c7038e432b5f..14df46eb85e8 100644 --- a/pkgs/by-name/li/libresprite/package.nix +++ b/pkgs/by-name/li/libresprite/package.nix @@ -7,7 +7,6 @@ pkg-config, ninja, gtest, - curl, freetype, giflib, @@ -38,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; hash = "sha256-jXjrA859hR46Cp5qi6Z1C+hLWCUR7yGlASOGlTveeW8="; }; - + patches = [ + # From https://github.com/LibreSprite/LibreSprite/pull/565 + ./cmake4.diff + ]; nativeBuildInputs = [ cmake pkg-config