diff --git a/flake.nix b/flake.nix
index 0ac2e5e35..4cd4aac80 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,17 +16,21 @@
     flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [ ];
       systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ];
-      perSystem = { pkgs, ... }:
+      perSystem = { pkgs, system, ... }:
         let
-          core = builtins.attrValues {
-            inherit (pkgs)
-              gcc13
-
-              # formatter & linters
-              astyle# 3.4.10
-              nixpkgs-fmt
-              shfmt;
-          };
+          # NOTE: For installing pkgs specific for aarch64 (not sure if there is any better way of doing this)
+          aarch-system = "aarch64-" + pkgs.lib.lists.last (pkgs.lib.strings.splitString "-" system);
+          aarch-pkgs = inputs.nixpkgs.legacyPackages.${aarch-system};
+          core = builtins.attrValues
+            {
+              inherit (pkgs)
+                # formatter & linters
+                astyle# 3.4.10
+                nixpkgs-fmt
+                shfmt;
+            }
+          ++ [ (aarch-pkgs.gcc13.override { propagateDoc = true; isGNU = true; }) ];
+
         in
         {
           devShells.default = pkgs.mkShellNoCC {