diff --git a/flake.nix b/flake.nix index a190efa..82ec1fb 100644 --- a/flake.nix +++ b/flake.nix @@ -182,7 +182,10 @@ ++ darwinPkgs ++ linuxPkgs; - darwinPkgs = nixpkgs.lib.optionals stdenv.isDarwin (with pkgs.pkgsStatic; [libiconv]); + darwinPkgs = nixpkgs.lib.optionals stdenv.isDarwin (with pkgs.pkgsStatic; [ + libiconv + apple-sdk_15 + ]); linuxPkgs = nixpkgs.lib.optionals stdenv.isLinux (with pkgs; [ @@ -240,7 +243,7 @@ }; }; - devShell = mkShell.override {inherit stdenv;} { + devShell = mkShell.override {inherit stdenv;} rec { packages = [ alejandra @@ -264,6 +267,11 @@ LD_LIBRARY_PATH = "${lib.makeLibraryPath deps}"; 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}"; + NIX_CXXFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isysroot ${SDKROOT}"; + NIX_OBJCFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isysroot ${SDKROOT}"; + NIX_OBJCXXFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isysroot ${SDKROOT}"; }; } ); diff --git a/meson.build b/meson.build index a7ab820..703ee49 100644 --- a/meson.build +++ b/meson.build @@ -26,7 +26,6 @@ common_warning_flags = [ '-Wno-c++20-extensions', '-Wno-c++98-compat', '-Wno-c++98-compat-pedantic', - '-Wno-covered-switch-default', '-Wno-disabled-macro-expansion', '-Wno-missing-prototypes', '-Wno-padded', @@ -60,8 +59,7 @@ if host_system == 'darwin' add_languages('objcpp', native : false) objcpp = meson.get_compiler('objcpp') objcpp_flags = common_warning_flags + [ - '-Wno-switch-default', - '-std=c++23', + '-std=c++26', '-fvisibility=hidden', '-fvisibility-inlines-hidden', ]