1
0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-19 09:29:36 +01:00

Add darwin as supported system and fix emacs package

Avoid linux only deps on darwin
This commit is contained in:
Stefan Ellmauthaler 2023-10-02 15:46:53 +02:00 committed by Stefan Ellmauthaler
parent 8302384817
commit 9acf1277c0
2 changed files with 13 additions and 6 deletions

View File

@ -74,7 +74,7 @@
in in
flake-utils-plus.lib.mkFlake rec { flake-utils-plus.lib.mkFlake rec {
inherit self inputs; inherit self inputs;
supportedSystems = ["x86_64-linux"]; supportedSystems = ["x86_64-linux" "aarch64-darwin"];
lib = extended-lib; lib = extended-lib;

View File

@ -6,9 +6,16 @@
with lib; let with lib; let
defaultEl = ./default.el; defaultEl = ./default.el;
#environment.systemPackages = [pkgs.gdb]; # use gdb for dap-mode #environment.systemPackages = [pkgs.gdb]; # use gdb for dap-mode
localsettings = pkgs.writeText "local-settings.el" '' localsettings =
(defconst elss/paths/cpptools "${pkgs.unstable.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools") if pkgs.system == "x86_64-linux"
(defconst elss/paths/cpptools-program "${pkgs.unstable.vscode-extensions.ms-vscode.cpptools}/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7") 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) (provide 'local-settings)
''; '';