Try not depending on pkgs

This commit is contained in:
Niten 2021-09-04 10:47:00 -07:00
parent fd36faff25
commit ed345c171f
2 changed files with 8 additions and 8 deletions

View File

@ -101,7 +101,7 @@ let
in {
nixpkgs.overlays = [
(import ./package-overlay.nix { inherit pkgs; })
(import ./package-overlay.nix)
];
programs = {

View File

@ -1,30 +1,30 @@
{ pkgs, ... }: final: prev: {
final: prev: {
doom-emacs-config = pkgs.fetchgit {
doom-emacs-config = prev.fetchgit {
url = "https://git.fudo.org/niten/doom-emacs.git";
rev = "0ab1532c856ccdb6ce46c5948054279f439eb1f2";
sha256 = "06mh74i5hmb15xid7w31wjc4v339cgddd667bpaphqnw666sm08h";
};
doom-emacs-pkg = pkgs.fetchgit {
doom-emacs-pkg = prev.fetchgit {
url = "https://github.com/vlaci/nix-doom-emacs.git";
rev = "fee14d217b7a911aad507679dafbeaa8c1ebf5ff";
sha256 = "1g0izscjh5nv4n0n1m58jc6z27i9pkbxs17mnb05a83ffdbmmva6";
};
user-doom-emacs = pkgs.callPackage final.doom-emacs-pkg {
user-doom-emacs = prev.callPackage final.doom-emacs-pkg {
doomPrivateDir = final.doom-emacs-config;
extraPackages = with pkgs.emacsPackages; [
extraPackages = with prev.emacsPackages; [
elpher
use-package
];
emacsPackagesOverlay = final: prev: {
irony = prev.irony.overrideAttrs (esuper: {
buildInputs = esuper.buildInputs
++ [ pkgs.cmake pkgs.libclang pkgs.clang ];
++ [ prev.cmake prev.libclang prev.clang ];
});
spinner = let version = "1.7.4";
in pkgs.emacsPackages.trivialBuild {
in prev.emacsPackages.trivialBuild {
inherit version;
pname = "spinner";
src = builtins.fetchTarball {