pupbrained/draconisplusplus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

whar

Browse source
This commit is contained in:
Mars 2025-05-11 15:50:43 -04:00
parent badb8b232f
commit e3799acaab
Signed by: pupbrained
GPG key ID: 874E22DF2F9DFCB5
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
flake.nix
View file

@ -249,7 +249,7 @@
}; };
}; };
devShell = mkShell.override {inherit stdenv;} rec { devShell = mkShell.override {inherit stdenv;} {
packages = packages =
[ [
alejandra alejandra
@ -273,11 +273,15 @@
LD_LIBRARY_PATH = "${lib.makeLibraryPath deps}"; LD_LIBRARY_PATH = "${lib.makeLibraryPath deps}";
NIX_ENFORCE_NO_NATIVE = 0; NIX_ENFORCE_NO_NATIVE = 0;
SDKROOT = lib.optionalString stdenv.isDarwin "${pkgs.pkgsStatic.apple-sdk_15}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk";
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isysroot ${SDKROOT}"; shellHook = lib.optionalString pkgs.stdenv.hostPlatform.isDarwin ''
NIX_CXXFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isysroot ${SDKROOT}"; export SDKROOT=${pkgs.pkgsStatic.apple-sdk_15}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
NIX_OBJCFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isysroot ${SDKROOT}"; export DEVELOPER_DIR=${pkgs.pkgsStatic.apple-sdk_15}
NIX_OBJCXXFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isysroot ${SDKROOT}"; export NIX_CFLAGS_COMPILE="-isysroot $SDKROOT"
export NIX_CXXFLAGS_COMPILE="-isysroot $SDKROOT"
export NIX_OBJCFLAGS_COMPILE="-isysroot $SDKROOT"
export NIX_OBJCXXFLAGS_COMPILE="-isysroot $SDKROOT"
'';
}; };
} }
); );

4
src/OS/macos/bridge.hpp
View file

@ -20,8 +20,8 @@ using util::types::MediaInfo, util::types::String, util::types::Result;
@end @end
#else #else
extern "C++" { extern "C++" {
fn GetCurrentPlayingInfo() -> Result<MediaInfo, DracError>; fn GetCurrentPlayingInfo() -> Result<MediaInfo>;
fn GetMacOSVersion() -> Result<String, DracError>; fn GetMacOSVersion() -> Result<String>;
} }
#endif #endif
#endif #endif