mirror of
https://github.com/larstvei/emacs-flake.git
synced 2025-08-30 16:50:13 +00:00
Compare commits
3 Commits
333b8ade1b
...
89b8619b12
Author | SHA1 | Date | |
---|---|---|---|
89b8619b12 | |||
b132266c3d | |||
34e0fccc16 |
2
.github/workflows/cachix.yml
vendored
2
.github/workflows/cachix.yml
vendored
@ -26,6 +26,6 @@ jobs:
|
|||||||
|
|
||||||
- name: Build and Push with Cachix
|
- name: Build and Push with Cachix
|
||||||
run: |
|
run: |
|
||||||
nix develop
|
|
||||||
set -e
|
set -e
|
||||||
|
nix develop
|
||||||
nix build --json | jq -r '.[].outputs | to_entries[].value' | cachix push larstvei
|
nix build --json | jq -r '.[].outputs | to_entries[].value' | cachix push larstvei
|
||||||
|
25
flake.nix
25
flake.nix
@ -16,23 +16,33 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
{ self, nixpkgs, flake-utils, emacs-overlay, emacs-plus, emacs-config }:
|
{
|
||||||
flake-utils.lib.eachDefaultSystem (system:
|
self,
|
||||||
|
nixpkgs,
|
||||||
|
flake-utils,
|
||||||
|
emacs-overlay,
|
||||||
|
emacs-plus,
|
||||||
|
emacs-config,
|
||||||
|
}:
|
||||||
|
flake-utils.lib.eachDefaultSystem (
|
||||||
|
system:
|
||||||
let
|
let
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
overlays =
|
overlays = [
|
||||||
[ emacs-overlay.overlays.emacs emacs-overlay.overlays.package ];
|
emacs-overlay.overlays.emacs
|
||||||
|
emacs-overlay.overlays.package
|
||||||
|
];
|
||||||
};
|
};
|
||||||
patched-emacs = (pkgs.emacs-git).overrideAttrs (o: {
|
patched-emacs = (pkgs.emacs-git).overrideAttrs (o: {
|
||||||
patches = [
|
patches = [
|
||||||
"${emacs-plus}/patches/emacs-31/fix-window-role.patch"
|
|
||||||
"${emacs-plus}/patches/emacs-31/round-undecorated-frame.patch"
|
"${emacs-plus}/patches/emacs-31/round-undecorated-frame.patch"
|
||||||
"${emacs-plus}/patches/emacs-31/system-appearance.patch"
|
"${emacs-plus}/patches/emacs-31/system-appearance.patch"
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
defaultPackage = pkgs.emacsWithPackagesFromUsePackage {
|
defaultPackage = pkgs.emacsWithPackagesFromUsePackage {
|
||||||
config = "${emacs-config}/init.org";
|
config = "${emacs-config}/init.org";
|
||||||
package = patched-emacs;
|
package = patched-emacs;
|
||||||
@ -46,5 +56,6 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
devShell = pkgs.mkShell { buildInputs = [ pkgs.jq ]; };
|
devShell = pkgs.mkShell { buildInputs = [ pkgs.jq ]; };
|
||||||
});
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user