Skip to content

Commit 25a40a0

Browse files
authored
build: Revert naersk, restore rustPlatform for cross-compilation (#43)
Naersk was introduced as an experiment for Nix build caching but doesn't handle cross-builds well, which we need for the release workflow. Reverts to nixpkgs' `rustPlatform.buildRustPackage` and bumps to 0.8.5.
1 parent a903f87 commit 25a40a0

5 files changed

Lines changed: 11 additions & 86 deletions

File tree

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "sysdig-lsp"
3-
version = "0.8.4"
3+
version = "0.8.5"
44
edition = "2024"
55
authors = [ "Sysdig Inc." ]
66
readme = "README.md"

flake.lock

Lines changed: 4 additions & 79 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,16 @@
22
inputs = {
33
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
44
flake-utils.url = "github:numtide/flake-utils";
5-
naersk.url = "github:nix-community/naersk"; # Allows rust build caching
65
};
76
outputs =
87
{
98
self,
109
nixpkgs,
1110
flake-utils,
12-
naersk,
1311
}:
1412
let
1513
overlays.default = final: prev: {
1614
sysdig-lsp = prev.callPackage ./package.nix { };
17-
naersk = prev.callPackage naersk { };
1815
};
1916

2017
flake = flake-utils.lib.eachDefaultSystem (

package.nix

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
naersk,
2+
rustPlatform,
33
pkgsStatic,
44
lib,
55
stdenv,
@@ -9,10 +9,13 @@
99
let
1010
cargoFile = builtins.fromTOML (builtins.readFile ./Cargo.toml);
1111
in
12-
naersk.buildPackage {
12+
rustPlatform.buildRustPackage {
1313
pname = cargoFile.package.name;
1414
version = cargoFile.package.version;
1515
src = ./.;
16+
cargoLock = {
17+
lockFile = ./Cargo.lock;
18+
};
1619

1720
nativeBuildInputs = [
1821
pkg-config

0 commit comments

Comments
 (0)