Skip to content

Commit 8f0a1c4

Browse files
committed
build(nix): make static compilation only in libiconv for macos
1 parent 0dec628 commit 8f0a1c4

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

flake.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}:
1212
let
1313
overlays.default = final: prev: {
14-
sysdig-lsp = prev.pkgsStatic.callPackage ./package.nix { };
14+
sysdig-lsp = prev.callPackage ./package.nix { };
1515
};
1616

1717
flake = flake-utils.lib.eachDefaultSystem (
@@ -28,8 +28,8 @@
2828
inherit sysdig-lsp;
2929
default = sysdig-lsp;
3030

31-
sysdig-lsp-linux-amd64 = pkgsCross.gnu64.sysdig-lsp;
32-
sysdig-lsp-linux-arm64 = pkgsCross.aarch64-multiplatform.sysdig-lsp;
31+
sysdig-lsp-linux-amd64 = pkgsStatic.pkgsCross.gnu64.sysdig-lsp;
32+
sysdig-lsp-linux-arm64 = pkgsStatic.pkgsCross.aarch64-multiplatform.sysdig-lsp;
3333
sysdig-lsp-darwin-amd64 = pkgsCross.x86_64-darwin.sysdig-lsp;
3434
sysdig-lsp-darwin-arm64 = pkgsCross.aarch64-darwin.sysdig-lsp;
3535
};

package.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
22
rustPlatform,
3+
pkgsStatic,
4+
lib,
5+
stdenv,
36
pkg-config,
47
openssl,
5-
...
68
}:
79
let
810
cargoFile = builtins.fromTOML (builtins.readFile ./Cargo.toml);
@@ -21,7 +23,7 @@ rustPlatform.buildRustPackage {
2123

2224
buildInputs = [
2325
openssl.dev
24-
];
26+
] ++ lib.optionals stdenv.hostPlatform.isDarwin (with pkgsStatic; [ libiconv ]);
2527

2628
doCheck = false;
2729
meta.mainProgram = "sysdig-lsp";

0 commit comments

Comments
 (0)