Skip to content

Commit

Permalink
CI: build more for cachix
Browse files Browse the repository at this point in the history
Exposes a bug: GTK3 (both emacs29-gtk3 and emacs29-pgtk) Emacs segfault
compiling jupyter, while loading emacs-zmq. So don't enable those yet,
need to debug that first...
  • Loading branch information
marienz committed Jun 29, 2024
1 parent 5f7f3b9 commit 10dae5d
Showing 1 changed file with 22 additions and 10 deletions.
32 changes: 22 additions & 10 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -96,21 +96,33 @@
doomLocalDir = "~/.local/share/nix-doom-unstraightened";
profileName = "";
}).doomEmacs;
# TODO: cache more packages, cache for more Emacsen.
cachix-packages = let
doomDirs = pkgs.callPackages ./build-helpers/doomdirs.nix {
doomSource = doomemacs;
};
inherit (nixpkgs) lib;
depBuilds = lib.mapCartesianProduct
({doomDir, emacs}: (
lib.nameValuePair
"${emacs.name}-${doomDir.name}"
(doomFromPackages pkgs {
doomDir = doomDir.value;
emacs = emacs.value;
doomLocalDir = "~/.local/share/nix-doom-unstraightened";
experimentalFetchTree = true;
}).doomEmacs.emacsWithPackages.deps))
{
doomDir = lib.attrsToList doomDirs;
# TODO: emacs29-gtk3 and emacs29-pgtk fail to build jupyter (segfault in zmq)
emacs = lib.attrsToList {
inherit (pkgs) emacs29 emacs29-nox;
};
};
in
pkgs.linkFarm "unstraightened-cachix-packages" {
inherit doomemacs;
full-emacs29 = (doomFromPackages pkgs {
emacs = pkgs.emacs29;
doomDir = doomDirs.allModules;
doomLocalDir = "~/.local/share/nix-doom-unstraightened";
experimentalFetchTree = true;
}).doomEmacs.emacsWithPackages.deps;
};
pkgs.linkFarm "unstraightened-cachix-packages" (
{ inherit doomemacs; }
// lib.listToAttrs depBuilds
);
});
overlays.default = final: prev: {
doomEmacs = args: (doomFromPackages final args).doomEmacs;
Expand Down

0 comments on commit 10dae5d

Please sign in to comment.