Skip to content

Commit

Permalink
feat(templates/bevy): update nixpkgs to use the latest darwin_sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
ryan4yin committed Nov 7, 2024
1 parent 984fac8 commit 28d66fe
Showing 1 changed file with 2 additions and 32 deletions.
34 changes: 2 additions & 32 deletions templates/bevy/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
])
# use rust-analyzer-nightly for better type inference
rust-analyzer-nightly
cargo-watch
]
# https://github.com/bevyengine/bevy/blob/v0.14.2/docs/linux_dependencies.md#nix
++ (lib.optionals pkgs.stdenv.isLinux [
Expand All @@ -66,40 +67,9 @@
# https://discourse.nixos.org/t/develop-shell-environment-setup-for-macos/11399
# https://github.com/NixOS/nixpkgs/blob/nixos-unstable-small/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
++ (pkgs.lib.optionals pkgs.stdenv.isDarwin [
# Additional darwin specific inputs can be set here
libiconv
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.ApplicationServices
darwin.apple_sdk.frameworks.CoreVideo
darwin.apple_sdk.frameworks.Carbon
darwin.apple_sdk.frameworks.AppKit
apple-sdk_15
]);
LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs;
COREAUDIO_SDK_PATH =
pkgs.lib.optionals
pkgs.stdenv.isDarwin
# The coreaudio-sys crate is configured to look for things in whatever the
# output of `xcrun --sdk macosx --show-sdk-path` is. However, this does not
# always contain the right frameworks, and it uses system versions instead of
# what we control via Nix. Instead of having to run a lot of extra scripts
# to set our systems up to build, we can just create a SDK directory with
# the same layout as the `MacOSX{version}.sdk` that XCode produces.
(pkgs.symlinkJoin {
name = "sdk";
paths = with pkgs.darwin.apple_sdk.frameworks; [
AudioToolbox
AudioUnit
CoreAudio
CoreAudioTypes
CoreFoundation
CoreMIDI
OpenAL
];
postBuild = ''
mkdir $out/System
mv $out/Library $out/System
'';
});
};
});
};
Expand Down

0 comments on commit 28d66fe

Please sign in to comment.