From 9b17c0931a0947d1e3be17d8580655f3c87ec795 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Apr 2025 14:53:13 +0000
Subject: [PATCH 1/2] juce: 8.0.6 -> 8.0.7

---
 pkgs/development/misc/juce/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/development/misc/juce/default.nix
index 1dc141cee531..16956d078fc9 100644
--- a/pkgs/development/misc/juce/default.nix
+++ b/pkgs/development/misc/juce/default.nix
@@ -34,13 +34,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "juce";
-  version = "8.0.6";
+  version = "8.0.7";
 
   src = fetchFromGitHub {
     owner = "juce-framework";
     repo = "juce";
     tag = finalAttrs.version;
-    hash = "sha256-uwZVBrvb5O9LEh00y93UeEu4u4rd+tLRCdQdxsMpXNg=";
+    hash = "sha256-nl4pUSkUKqpMoehzq0MS5pjHpYDkrFpUsY8BwpQObCM=";
   };
 
   patches = [

From d0a16256908fabbb6f674ac99334c49305b3e7ff Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 16 Apr 2025 10:26:52 +0200
Subject: [PATCH 2/2] juce: move to by-name

---
 .../ju}/juce/juce-8.0.4-cmake_install.patch              | 0
 .../juce/default.nix => by-name/ju/juce/package.nix}     | 9 +++++++++
 pkgs/top-level/all-packages.nix                          | 4 ----
 3 files changed, 9 insertions(+), 4 deletions(-)
 rename pkgs/{development/misc => by-name/ju}/juce/juce-8.0.4-cmake_install.patch (100%)
 rename pkgs/{development/misc/juce/default.nix => by-name/ju/juce/package.nix} (91%)

diff --git a/pkgs/development/misc/juce/juce-8.0.4-cmake_install.patch b/pkgs/by-name/ju/juce/juce-8.0.4-cmake_install.patch
similarity index 100%
rename from pkgs/development/misc/juce/juce-8.0.4-cmake_install.patch
rename to pkgs/by-name/ju/juce/juce-8.0.4-cmake_install.patch
diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/by-name/ju/juce/package.nix
similarity index 91%
rename from pkgs/development/misc/juce/default.nix
rename to pkgs/by-name/ju/juce/package.nix
index 16956d078fc9..308103c09bb7 100644
--- a/pkgs/development/misc/juce/default.nix
+++ b/pkgs/by-name/ju/juce/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  overrideSDK,
   fetchFromGitHub,
 
   # Native build inputs
@@ -32,6 +33,14 @@
   nix-update-script,
 }:
 
+let
+  # Rebind this in a separate let-binding so that we can then rebind stdenv without infrec below
+  stdenv' = stdenv;
+in
+let
+  stdenv = if stdenv'.hostPlatform.isDarwin then overrideSDK stdenv' "11.0" else stdenv';
+in
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "juce";
   version = "8.0.7";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85278cf90f59..bf222f33c540 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2521,10 +2521,6 @@ with pkgs;
 
   jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { };
 
-  juce = callPackage ../development/misc/juce {
-    stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
-  };
-
   kaldi = callPackage ../tools/audio/kaldi {
     inherit (darwin.apple_sdk.frameworks) Accelerate;
   };