From 9acf1277c0c54d68b9cbf113adf75a7aeb20043f Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Mon, 2 Oct 2023 15:46:53 +0200 Subject: [PATCH] Add darwin as supported system and fix emacs package Avoid linux only deps on darwin --- flake.nix | 2 +- packages/emacs/default.nix | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 8c78999..d6e3a98 100644 --- a/flake.nix +++ b/flake.nix @@ -74,7 +74,7 @@ in flake-utils-plus.lib.mkFlake rec { inherit self inputs; - supportedSystems = ["x86_64-linux"]; + supportedSystems = ["x86_64-linux" "aarch64-darwin"]; lib = extended-lib; diff --git a/packages/emacs/default.nix b/packages/emacs/default.nix index 5172983..3b17201 100644 --- a/packages/emacs/default.nix +++ b/packages/emacs/default.nix @@ -6,11 +6,18 @@ with lib; let defaultEl = ./default.el; #environment.systemPackages = [pkgs.gdb]; # use gdb for dap-mode - localsettings = pkgs.writeText "local-settings.el" '' - (defconst elss/paths/cpptools "${pkgs.unstable.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools") - (defconst elss/paths/cpptools-program "${pkgs.unstable.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7") - (provide 'local-settings) - ''; + localsettings = + if pkgs.system == "x86_64-linux" + then + pkgs.writeText "local-settings.el" '' + (defconst elss/paths/cpptools " ${pkgs.unstable.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools") + (defconst elss/paths/cpptools-progr am "${pkgs.unstable.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7") + (provide 'local-settings) + '' + else + pkgs.writeText "local-settings.el" '' + (provide 'local-settings) + ''; defaultConfig = pkgs.runCommand "default.el" {} '' mkdir -p $out/share/emacs/site-lisp