cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

juce: switch to overrideSDK

Browse source 
Using overrideSDK allows juce to use the correct SDK frameworks
even when they are propagated from curl.
This commit is contained in:
Randy Eckenrode 2023-10-25 14:42:09 -04:00
parent c2a623b52a
commit 19214a27a2
No known key found for this signature in database
GPG key ID: 64C1CD4EC2A600D9
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/misc/juce/default.nix
View file

@ -53,9 +53,9 @@ stdenv.mkDerivation (finalAttrs: {
libglvnd # libGL.so libglvnd # libGL.so
webkitgtk # webkit2gtk-4.0 webkitgtk # webkit2gtk-4.0
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk_11_0.frameworks.Cocoa darwin.apple_sdk.frameworks.Cocoa
darwin.apple_sdk_11_0.frameworks.MetalKit darwin.apple_sdk.frameworks.MetalKit
darwin.apple_sdk_11_0.frameworks.WebKit darwin.apple_sdk.frameworks.WebKit
]; ];
meta = with lib; { meta = with lib; {

4
pkgs/top-level/all-packages.nix
View file

@ -5755,7 +5755,9 @@ with pkgs;
joystickwake = callPackage ../tools/games/joystickwake { }; joystickwake = callPackage ../tools/games/joystickwake { };
juce = darwin.apple_sdk_11_0.callPackage ../development/misc/juce { }; juce = callPackage ../development/misc/juce {
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
};
jumppad = callPackage ../tools/virtualization/jumppad { }; jumppad = callPackage ../tools/virtualization/jumppad { };