From 9245cfdd2df77770342c7d749c6dbda98e8ad7e4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 27 Oct 2025 06:20:32 +0000 Subject: [PATCH] amiberry: backport cmake-4 fix Without the change the buidl fails in `master` as https://hydra.nixos.org/build/310522154: CMake Error at external/capsimage/CMakeLists.txt:1 (cmake_minimum_required): Compatibility with CMake < 3.5 has been removed from CMake. Co-authored-by: Rafael Ieda <60272+iedame@users.noreply.github.com> --- pkgs/by-name/am/amiberry/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/am/amiberry/package.nix b/pkgs/by-name/am/amiberry/package.nix index 5bae30e36630..384fbcd30146 100644 --- a/pkgs/by-name/am/amiberry/package.nix +++ b/pkgs/by-name/am/amiberry/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, copyDesktopItems, makeWrapper, @@ -28,6 +29,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-EOoVJYefX2pQ2Zz9bLD1RS47u/+7ZWTMwZYha0juF64="; }; + patches = [ + # cmake-4 support + (fetchpatch { + name = "cmake-4.patch"; + url = "https://github.com/BlitterStudio/amiberry/commit/dbd85a37147603875b9ca51a9409c65a26c0d60a.patch?full_index=1"; + hash = "sha256-w8Z9yhNafbXWv3nV8GDNpks2R1+M12uG1mWWrwVaEUk="; + }) + ]; + nativeBuildInputs = [ cmake copyDesktopItems