Commit 177adfa1 authored by Emily's avatar Emily
Browse files

chow-tape-model: patch for GCC ≥ 12

parent 3d3e80e3

pkgs/by-name/ch/chow-tape-model/fix-juce-gcc-12.patch

0 → 100644
+14 −0
Original line number Diff line number Diff line 
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 <utility>

+

 namespace juce

 {

pkgs/by-name/ch/chow-tape-model/package.nix

+6 −6
Original line number Diff line number Diff line
@@ -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