From 1f8886684fa0e0aa0c329f86f3c827bd3c96cffe Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 19 Nov 2023 02:37:51 +0000 Subject: [PATCH] ship abaddon discord client --- hosts/common/programs/abaddon.nix | 20 ++++++++++++++++++++ hosts/common/programs/assorted.nix | 5 ----- hosts/common/programs/default.nix | 1 + hosts/modules/gui/default.nix | 1 + 4 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 hosts/common/programs/abaddon.nix diff --git a/hosts/common/programs/abaddon.nix b/hosts/common/programs/abaddon.nix new file mode 100644 index 00000000..502084d2 --- /dev/null +++ b/hosts/common/programs/abaddon.nix @@ -0,0 +1,20 @@ +# discord gtk3 client +{ lib, pkgs, ... }: +{ + sane.programs.abaddon = { + # nixpkgs marks this explicitly as x86_64-only. + # but i can build it for aarch64 here. + # the only x86_64 runtime dependency is gnum4, via gtkmm (likely unused; build remnant). + # TODO: if it works reliably on aarch64, upstream this! + package = pkgs.abaddon.overrideAttrs (upstream: { + meta = upstream.meta // { + platforms = lib.platforms.linux; + }; + }); + + persist.byStore.private = [ + ".cache/abaddon" + ".config/abaddon" # empty? + ]; + }; +} diff --git a/hosts/common/programs/assorted.nix b/hosts/common/programs/assorted.nix index 10db285f..d0f928ff 100644 --- a/hosts/common/programs/assorted.nix +++ b/hosts/common/programs/assorted.nix @@ -217,11 +217,6 @@ in # INDIVIDUAL PACKAGE DEFINITIONS - abaddon.persist.byStore.private = [ - ".cache/abaddon" - ".config/abaddon" # empty? - ]; - animatch.persist.byStore.plaintext = [ # game progress ".config/Holy Pangolin/Animatch" diff --git a/hosts/common/programs/default.nix b/hosts/common/programs/default.nix index 378bb7d2..4a9e1f89 100644 --- a/hosts/common/programs/default.nix +++ b/hosts/common/programs/default.nix @@ -2,6 +2,7 @@ { imports = [ + ./abaddon.nix ./aerc.nix ./alacritty.nix ./assorted.nix diff --git a/hosts/modules/gui/default.nix b/hosts/modules/gui/default.nix index 53a221ac..f407aeda 100644 --- a/hosts/modules/gui/default.nix +++ b/hosts/modules/gui/default.nix @@ -53,6 +53,7 @@ in ]; sane.programs.guiBaseApps = declPackageSet [ + "abaddon" # discord client "alacritty" # terminal emulator "dialect" # language translation "dino" # XMPP client