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 87% rename from pkgs/development/misc/juce/default.nix rename to pkgs/by-name/ju/juce/package.nix index 1dc141cee531..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,15 +33,23 @@ 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.6"; + version = "8.0.7"; src = fetchFromGitHub { owner = "juce-framework"; repo = "juce"; tag = finalAttrs.version; - hash = "sha256-uwZVBrvb5O9LEh00y93UeEu4u4rd+tLRCdQdxsMpXNg="; + hash = "sha256-nl4pUSkUKqpMoehzq0MS5pjHpYDkrFpUsY8BwpQObCM="; }; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b03ffcc2e61f..b2947fce1c8d 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; };