From b1e28ccd61d818bfee3d52c6c9ab80caa6a17304 Mon Sep 17 00:00:00 2001 From: SkohTV Date: Thu, 9 Oct 2025 15:15:02 -0400 Subject: [PATCH] adlplug: fix cmake 4 compatibility --- pkgs/by-name/ad/adlplug/cmake-v4.patch | 19 +++++++++++++++++++ pkgs/by-name/ad/adlplug/package.nix | 13 +++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/by-name/ad/adlplug/cmake-v4.patch diff --git a/pkgs/by-name/ad/adlplug/cmake-v4.patch b/pkgs/by-name/ad/adlplug/cmake-v4.patch new file mode 100644 index 000000000000..155c80b7e585 --- /dev/null +++ b/pkgs/by-name/ad/adlplug/cmake-v4.patch @@ -0,0 +1,19 @@ +From 17228e7435f0c3e4244fb8853835538807ca7505 Mon Sep 17 00:00:00 2001 +From: SkohTV +Date: Thu, 9 Oct 2025 15:51:07 -0400 +Subject: [PATCH] Increase `cmake_minimum_required`: 3.3 -> 3.10 cmake 4.0 + dropped the support for cmake < 3.5 + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1c26f9a..ca8e4c2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION "3.3") ++cmake_minimum_required(VERSION 3.3...3.10) + cmake_policy(SET CMP0063 NEW) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") diff --git a/pkgs/by-name/ad/adlplug/package.nix b/pkgs/by-name/ad/adlplug/package.nix index 2902d59de731..32b532513fba 100644 --- a/pkgs/by-name/ad/adlplug/package.nix +++ b/pkgs/by-name/ad/adlplug/package.nix @@ -52,6 +52,19 @@ stdenv.mkDerivation { (lib.cmakeBool "ADLplug_Jack" withJack) ]; + # See https://github.com/NixOS/nixpkgs/issues/445447 + postPatch = '' + substituteInPlace thirdparty/{libADLMIDI,libOPNMIDI}/CMakeLists.txt --replace-fail \ + 'cmake_minimum_required (VERSION 3.2)' \ + 'cmake_minimum_required (VERSION 3.10)' + ''; + + patches = [ + # fix for CMake v4 + # https://github.com/jpcima/ADLplug/pull/100 + ./cmake-v4.patch + ]; + NIX_LDFLAGS = toString ( lib.optionals stdenv.hostPlatform.isDarwin [ # Framework that JUCE needs which don't get linked properly