emacs: use standard nixpkgs build

Now that native comp is stable I don't need the overlay, which triggered
a full emacs build almost everytime I bumped it.
This commit is contained in:
Antoine Martin 2022-05-15 20:05:07 +02:00
parent a4d3e6b6f8
commit f54d1ce5b2
4 changed files with 7 additions and 83 deletions

View file

@ -21,13 +21,6 @@
repo = "agenix";
};
emacs-overlay = {
type = "github";
owner = "nix-community";
repo = "emacs-overlay";
ref = "master";
};
home-manager = {
type = "github";
owner = "nix-community";
@ -117,8 +110,6 @@
{
nixpkgs.overlays = [
inputs.emacs-overlay.overlay
# uncomment this to build everything from scratch, fun but takes a
# while
#
@ -140,12 +131,6 @@
inputs.nixos-hardware.nixosModules.common-cpu-intel
inputs.nixos-hardware.nixosModules.common-pc-laptop
inputs.nixos-hardware.nixosModules.common-pc-ssd
{
nixpkgs.overlays = [
inputs.emacs-overlay.overlay
];
}
]
++ sharedModules;
};
@ -153,19 +138,9 @@
}
// inputs.flake-utils.lib.eachDefaultSystem (system: {
packages =
(
inputs.flake-utils.lib.flattenTree
(import ./pkgs {pkgs = import nixpkgs {inherit system;};})
)
// {
emacsPgtkNativeComp =
(
import nixpkgs {
inherit system;
overlays = [inputs.emacs-overlay.overlay];
}
)
.emacsPgtkNativeComp;
};
inputs.flake-utils.lib.flattenTree
(import ./pkgs {
pkgs = import nixpkgs {inherit system;};
});
});
}