From 177adfa166396fd5073c6f66563ef8f88ad5fd30 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 8 Aug 2025 18:22:54 +0100 Subject: [PATCH] =?UTF-8?q?chow-tape-model:=20patch=20for=20GCC=20?= =?UTF-8?q?=E2=89=A5=2012?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ch/chow-tape-model/fix-juce-gcc-12.patch | 14 ++++++++++++++ pkgs/by-name/ch/chow-tape-model/package.nix | 12 ++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/ch/chow-tape-model/fix-juce-gcc-12.patch diff --git a/pkgs/by-name/ch/chow-tape-model/fix-juce-gcc-12.patch b/pkgs/by-name/ch/chow-tape-model/fix-juce-gcc-12.patch new file mode 100644 index 000000000000..3f18f07d4012 --- /dev/null +++ b/pkgs/by-name/ch/chow-tape-model/fix-juce-gcc-12.patch @@ -0,0 +1,14 @@ +Submodule Plugin/modules/JUCE contains modified content +diff --git a/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h b/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h +index 06c0a729d..119f146b8 100644 +--- a/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h ++++ b/Plugin/modules/JUCE/modules/juce_gui_basics/windows/juce_ComponentPeer.h +@@ -23,6 +23,8 @@ + ============================================================================== + */ + ++#include ++ + namespace juce + { + diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix index 75da391e7914..b9f5a5eb3a3a 100644 --- a/pkgs/by-name/ch/chow-tape-model/package.nix +++ b/pkgs/by-name/ch/chow-tape-model/package.nix @@ -32,14 +32,9 @@ pkg-config, python3, sqlite, - gcc11Stdenv, + stdenv, webkitgtk_4_0, }: -let - # JUCE version in submodules is incompatible with GCC12 - # See here: https://forum.juce.com/t/build-fails-on-fedora-wrong-c-version/50902/2 - stdenv = gcc11Stdenv; -in stdenv.mkDerivation (finalAttrs: { pname = "chow-tape-model"; version = "2.11.4"; @@ -52,6 +47,11 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + # Fix the old JUCE submodule for GCC ≥ 12 + ./fix-juce-gcc-12.patch + ]; + nativeBuildInputs = [ pkg-config cmake