magic_rb/dotfiles
1
0
Fork 0
mirror of https://git.sr.ht/~magic_rb/dotfiles synced 2024-11-26 01:56:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Flatten emacs-ng package location

Browse source 
Signed-off-by: Magic_RB <magic_rb@redalder.org>
This commit is contained in:
Magic_RB 2023-05-28 12:43:49 +02:00
parent 44df8c3076
commit 177d3c74a0
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
2 changed files with 196 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
home-manager/modules/emacs/default.nix
View file

@ -31,8 +31,13 @@ in {
rWrapper.override
{packages = with rPackages; [ggplot2];};
in
(pkgs.magic_rb.emacs.override
(pkgs.emacs-magicrb.override
{
pkgs.emacs = pkgs.emacs.overrideAttrs
(old:
{
# patches = [ ./native-comp-driver-options.patch ];
});
march = config.magic_rb.optimisation.march;
hunspell.enable = true;
hunspell.dictionaries = with pkgs.hunspellDicts; [en_US];

49
overlays/emacs-ng.nix
View file

@ -22,10 +22,7 @@
meta = removeAttrs cfg.hunspell.package.meta ["outputsToInstall"];
};
in {
magic_rb =
prev.magic_rb
or {}
// {
libvterm-emacs = stdenv.mkDerivation {
name = "vterm-emacs";
src = vtermModule;
@ -40,9 +37,10 @@
'';
};
emacs =
emacs-magicrb =
callPackage
(module: let
(module:
let
mkPkgOption = name:
mkOption {
description = "`${name}` package.";
@ -59,6 +57,13 @@
({config, ...}: {
options = {
pkgs = {
gcc = mkOption {
description = "`gcc` package.";
default = prev.libgccjit.stdenv.cc;
type = types.package;
};
gnumake = mkPkgOption "gnumake";
emacs = mkPkgOption "emacs";
giflib = mkPkgOption "giflib";
librsvg = mkPkgOption "librsvg";
glib-networking = mkPkgOption "glib-networking";
@ -71,7 +76,7 @@
makeWrapper = mkPkgOption "makeWrapper";
libvterm-emacs = mkOption {
description = "`libvterm-emacs` package.";
default = final.magic_rb.libvterm-emacs;
default = final.libvterm-emacs;
type = types.package;
};
tree-sitter = mkOption {
@ -139,27 +144,28 @@
config = {
additionalPackages =
optional config.hunspell.enable (hunspellWithDicts config);
(optional config.hunspell.enable (hunspellWithDicts config))
++ [ ];
output.base =
(prev.emacs.override
(config.pkgs.emacs.override
{
withX = false;
withGTK3 = false;
withPgtk = true;
inherit (prev)
gtk3-x11
gtk3
gsettings-desktop-schemas;
withSQLite3 = true;
nativeComp = true;
srcRepo = true;
inherit (prev)
autoreconfHook
texinfo;
libXaw = null;
Xaw3d = null;
gconf = null;
alsa-lib = null;
acl = null;
gpm = null;
AppKit = null;
GSS = null;
ImageIO = null;
sigtool = null;
withWebP = true;
})
.overrideAttrs
(old: {
@ -227,5 +233,4 @@
evaled.config.output)
{};
};
};
}