M flake.nix → flake.nix

@@ -14,45 +14,34 @@ }@inputs:
     let
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
+      base = (
+        with pkgs;
+        [
+          meson
+          ninja
+          just
+          clang-tools
+          valgrind
+          bear
+          tokei
+          ruby
+          just-lsp
+          just-formatter
+        ]
+      );
       main_shl = pkgs.mkShell {
         name = "circe-tooling-env-x86_64-glibc";
-        packages = (
-          with pkgs;
-          [
-            meson
-            ninja
-            just
-            gcc
-            clang-tools
-            valgrind
-            bear
-            tokei
-            ruby
-            just-lsp
-            just-formatter
-          ]
-        );
+        packages = base ++ (with pkgs; [ gcc ]);
         NIX_ENFORCE_NO_NATIVE = 0;
         hardeningDisable = [ "fortify" ];
       };
       aarch64_musl_shl = pkgs.mkShell {
         name = "circe-tooling-env-aarch64-musl";
-        packages = (
-          with pkgs;
-          [
-            meson
-            ninja
-            just
-            clang-tools
-            valgrind
-            bear
-            tokei
-            ruby
-            just-lsp
+        packages =
+          base
+          ++ (with pkgs; [
             pkgsCross.aarch64-multiplatform-musl.gcc
-            just-formatter
-          ]
-        );
+          ]);
       };
     in
     {

M meson.build → meson.build

@@ -12,6 +12,7 @@ '-O3',
     '-ffreestanding',
     '-nostdlib',
     '-lgcc',
+    '-fno-stack-protector'
 ]
 
 common_sources = [
@@ -44,6 +45,7 @@ '-O3',
     '-ffreestanding',
     '-nostdlib',
     '-lgcc',
+    '-fno-stack-protector',
 ]
 
 core_sources = [