Use the input branch of kakoune to build .#nki-kakoune

This commit is contained in:
Natsu Kagami 2025-04-05 23:27:57 +02:00
parent dc7f6c51d7
commit c5623b5174
Signed by: nki
GPG key ID: 55A032EB38B49ADB
2 changed files with 26 additions and 9 deletions

View file

@ -187,11 +187,27 @@
++ extraModules;
};
kakoune-unwrapped-from-pkgs =
pkgs:
pkgs.kakoune-unwrapped.overrideAttrs (attrs: {
version = "r${builtins.substring 0 6 inputs.kakoune.rev}";
src = inputs.kakoune;
patches = [
# patches in the original package was already applied
];
});
nki-kakoune-from-pkgs =
pkgs:
pkgs.callPackage ./packages/common/nki-kakoune {
kakoune-unwrapped = kakoune-unwrapped-from-pkgs pkgs;
};
in
{
overlays = {
default = lib.composeManyExtensions overlays;
kakoune = final: prev: {
kakoune-unwrapped = kakoune-unwrapped-from-pkgs prev;
nki-kakoune = final.callPackage ./packages/common/nki-kakoune { };
};
};
@ -199,15 +215,15 @@
packages.x86_64-linux.deploy-rs = deploy-rs.packages.x86_64-linux.default;
apps.x86_64-linux.deploy-rs = deploy-rs.apps.x86_64-linux.default;
packages.x86_64-linux.nki-kakoune =
(import nixpkgs-unstable { system = "x86_64-linux"; }).callPackage ./packages/common/nki-kakoune
{ };
packages.aarch64-linux.nki-kakoune =
(import nixpkgs-unstable { system = "aarch64-linux"; }).callPackage ./packages/common/nki-kakoune
{ };
packages.aarch64-darwin.nki-kakoune =
(import nixpkgs-unstable { system = "aarch64-darwin"; }).callPackage ./packages/common/nki-kakoune
{ };
packages.x86_64-linux.nki-kakoune = nki-kakoune-from-pkgs (
import nixpkgs-unstable { system = "x86_64-linux"; }
);
packages.aarch64-linux.nki-kakoune = nki-kakoune-from-pkgs (
import nixpkgs-unstable { system = "aarch64-linux"; }
);
packages.aarch64-darwin.nki-kakoune = nki-kakoune-from-pkgs (
import nixpkgs-unstable { system = "aarch64-darwin"; }
);
# MacBook configuration: nix-darwin + home-manager
darwinConfigurations."nki-macbook" = darwin.lib.darwinSystem rec {

View file

@ -12,6 +12,7 @@
...
}:
(kakoune.override {
kakoune = kakoune-unwrapped;
plugins =
nki-kak-plugins
++ nki-kak-themes