nki/nix-home
1
0
Fork 0
Code Issues Pull requests 2 Packages Projects Releases Wiki Activity

kak-lsp: build with rustPlatform.buildRustApplication

Browse source
This commit is contained in:
Natsu Kagami 2025-02-15 14:45:40 +01:00
parent 20287ca12f
commit 0ada1ba34f
Signed by: nki
GPG key ID: 55A032EB38B49ADB
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
overlay.nix
View file

@ -100,19 +100,24 @@ let
overlay-packages = final: prev: { overlay-packages = final: prev: {
kak-tree-sitter = final.callPackage ./packages/common/kak-tree-sitter { rustPlatform = final.unstable.rustPlatform; }; kak-tree-sitter = final.callPackage ./packages/common/kak-tree-sitter { rustPlatform = final.unstable.rustPlatform; };
kak-lsp = kak-lsp = final.rustPlatform.buildRustPackage {
let name = "kak-lsp";
src = inputs.kak-lsp; src = inputs.kak-lsp;
cargoArtifacts = final.libs.crane.buildDepsOnly { inherit src; }; cargoHash = "sha256-U9KxTHzIDtdJ3A62rcdvWlxJfnhbFnS6KDRaV0HJOHE=";
in buildInputs = [ final.libiconv ];
final.libs.crane.buildPackage {
inherit src cargoArtifacts;
buildInputs = (with final;
lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration CoreServices ])
) ++ (with final; [ libiconv ]);
meta.mainProgram = "kak-lsp"; meta.mainProgram = "kak-lsp";
}; };
# cargoArtifacts = final.libs.crane.buildDepsOnly { inherit src; };
# in
# final.libs.crane.buildPackage {
# inherit src cargoArtifacts;
# buildInputs = (with final;
# lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration CoreServices ])
# ) ++ (with final; [ libiconv ]);
# meta.mainProgram = "kak-lsp";
# };
zen-browser-bin = inputs.zen-browser.packages.${final.stdenv.system}.zen-browser.override { zen-browser-bin = inputs.zen-browser.packages.${final.stdenv.system}.zen-browser.override {
inherit (inputs.zen-browser.packages.${final.stdenv.system}) zen-browser-unwrapped; inherit (inputs.zen-browser.packages.${final.stdenv.system}) zen-browser-unwrapped;

8
packages/common/kak-tree-sitter/default.nix
View file

@ -3,15 +3,15 @@ let
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~hadronized"; owner = "~hadronized";
repo = "kak-tree-sitter"; repo = "kak-tree-sitter";
rev = "kak-tree-sitter-v1.1.2"; rev = "kak-tree-sitter-v1.1.3";
hash = "sha256-wBWfSyR8LGtug/mCD0bJ4lbdN3trIA/03AnCxZoEOSA="; hash = "sha256-vQZ+zQgwIw5ZBdIuMDD37rIdhe+WpNBmq0TciXBNiSU=";
}; };
kak-tree-sitter = rustPlatform.buildRustPackage { kak-tree-sitter = rustPlatform.buildRustPackage {
inherit src; inherit src;
pname = "kak-tree-sitter"; pname = "kak-tree-sitter";
version = "1.1.2"; version = "1.1.3";
cargoHash = "sha256-ruHklps7NZzsI1ub1trRKyufrP9tufWWrQ+urvEsIdA="; cargoHash = "sha256-1OwPfl1446SYt1556jwR9mvWOWEv+ab+wH7GZQeS4/E=";
cargoBuildOptions = [ "--package" "kak-tree-sitter" "--package" "ktsctl" ]; cargoBuildOptions = [ "--package" "kak-tree-sitter" "--package" "ktsctl" ];
nativeBuildInputs = [ clang git ]; nativeBuildInputs = [ clang git ];