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

yay i can use c++26 everywhere

Browse source
This commit is contained in:
Mars 2025-05-07 14:21:08 -04:00
parent 8efd85e0a9
commit 2825007345
Signed by: pupbrained
GPG key ID: 874E22DF2F9DFCB5
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.nix
View file

@ -182,7 +182,10 @@
++ darwinPkgs ++ darwinPkgs
++ linuxPkgs; ++ 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; linuxPkgs = nixpkgs.lib.optionals stdenv.isLinux (with pkgs;
[ [
@ -240,7 +243,7 @@
}; };
}; };
devShell = mkShell.override {inherit stdenv;} { devShell = mkShell.override {inherit stdenv;} rec {
packages = packages =
[ [
alejandra alejandra
@ -264,6 +267,11 @@
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}";
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}";
}; };
} }
); );

4
meson.build
View file

@ -26,7 +26,6 @@ common_warning_flags = [
'-Wno-c++20-extensions', '-Wno-c++20-extensions',
'-Wno-c++98-compat', '-Wno-c++98-compat',
'-Wno-c++98-compat-pedantic', '-Wno-c++98-compat-pedantic',
'-Wno-covered-switch-default',
'-Wno-disabled-macro-expansion', '-Wno-disabled-macro-expansion',
'-Wno-missing-prototypes', '-Wno-missing-prototypes',
'-Wno-padded', '-Wno-padded',
@ -60,8 +59,7 @@ if host_system == 'darwin'
add_languages('objcpp', native : false) add_languages('objcpp', native : false)
objcpp = meson.get_compiler('objcpp') objcpp = meson.get_compiler('objcpp')
objcpp_flags = common_warning_flags + [ objcpp_flags = common_warning_flags + [
'-Wno-switch-default', '-std=c++26',
'-std=c++23',
'-fvisibility=hidden', '-fvisibility=hidden',
'-fvisibility-inlines-hidden', '-fvisibility-inlines-hidden',
] ]