summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2023-03-06 10:25:50 +0100
committerAlan Pearce2023-03-06 10:25:50 +0100
commitdc112cc7a57dabc7d3cbc43f080aef559bd65c3c (patch)
tree34efb63052940bb1405c2182ac34a9732972fa75
parent171f21cc7a63e5bc9135264d867ee08734edb972 (diff)
downloadnixfiles-dc112cc7a57dabc7d3cbc43f080aef559bd65c3c.tar.lz
nixfiles-dc112cc7a57dabc7d3cbc43f080aef559bd65c3c.tar.zst
nixfiles-dc112cc7a57dabc7d3cbc43f080aef559bd65c3c.zip
darwin: switch to aarch64 by using default Emacs instead of MacPort
-rw-r--r--flake.nix2
-rw-r--r--user/settings/darwin.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/flake.nix b/flake.nix
index d3b6f969..24d63ca0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,7 @@
     secrets,
     ...
   } @ attrs: let
-    darwinSystem = "x86_64-darwin"; # aarch64 is still failing on some compiler-rt derivation
+    darwinSystem = "aarch64-darwin";
     darwinPkgs = nixpkgs.legacyPackages.${darwinSystem};
     nixosSystem = "x86_64-linux";
     nixosPkgs = nixpkgs.legacyPackages.${nixosSystem};
diff --git a/user/settings/darwin.nix b/user/settings/darwin.nix
index 1eee1b9f..c1fab9d0 100644
--- a/user/settings/darwin.nix
+++ b/user/settings/darwin.nix
@@ -38,7 +38,7 @@
   ];
   home.packages = with pkgs; [aspell aspellDicts.en darwin-zsh-completions];
 
-  programs.emacs.package = pkgs.emacsMacport;
+  programs.emacs.package = pkgs.emacs;
 
   home.file.".hushlogin".text = "";