Compare commits

...

3 Commits

Author SHA1 Message Date
89b8619b12 Remove fix-window-role
Some checks failed
Build and Cache with Cachix / build (push) Has been cancelled
Update Flake / update-flake (push) Has been cancelled
See cd8d57de9a
2025-08-11 17:14:29 +02:00
b132266c3d Run formatter 2025-08-11 17:14:29 +02:00
34e0fccc16
Update cachix.yml
Throw an error if nix develop failes
2025-08-11 17:11:41 +02:00
2 changed files with 19 additions and 8 deletions

View File

@ -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

View File

@ -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 ]; };
}); }
);
} }