Skip to content

Commit a889c91

Browse files
committed
fix(packages): Fix last remaining issues reported by nix flake check
* Add `autoPatchelfHook` to `nativeBuildInputs` only when compiling for Linux * Correctly specify the list of supported platforms for `rapidsnark-server`
1 parent 4cf6138 commit a889c91

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

packages/rapidsnark-server/default.nix

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
lib,
23
stdenv,
34
pistache,
45
ffiasm,
@@ -9,7 +10,12 @@
910
in
1011
stdenv.mkDerivation rec {
1112
pname = "rapidsnark-server";
12-
inherit (rapidsnark) version src nativeBuildInputs doCheck meta;
13+
inherit (rapidsnark) version src nativeBuildInputs doCheck;
14+
meta =
15+
rapidsnark.meta
16+
// {
17+
platforms = with lib.platforms; linux;
18+
};
1319
buildInputs = rapidsnark.buildInputs ++ [pistache];
1420

1521
buildPhase = ''

packages/solana-bpf-tools/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ with pkgs;
1010
};
1111

1212
# TODO autoPatchElf is Linux-specific. We need a cross-platform solution.
13-
nativeBuildInputs = [autoPatchelfHook];
13+
nativeBuildInputs = lib.optionals stdenv.isLinux [autoPatchelfHook];
1414

1515
buildInputs = with pkgs; [
1616
zlib

packages/wasmd/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ in
3535

3636
subPackages = ["cmd/wasmd"];
3737

38-
buildInputs = [autoPatchelfHook];
38+
nativeBuildInputs = lib.optionals stdenv.isLinux [autoPatchelfHook];
3939

4040
postBuild = ''
4141
mkdir -p "$out/lib"

0 commit comments

Comments
 (0)