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`
metacraft-labs · Apr 13, 2023 · a889c91 · a889c91
1 parent 4cf6138
commit a889c91
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/packages/rapidsnark-server/default.nix b/packages/rapidsnark-server/default.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   stdenv,
   pistache,
   ffiasm,
@@ -9,7 +10,12 @@
 in
   stdenv.mkDerivation rec {
     pname = "rapidsnark-server";
-    inherit (rapidsnark) version src nativeBuildInputs doCheck meta;
+    inherit (rapidsnark) version src nativeBuildInputs doCheck;
+    meta =
+      rapidsnark.meta
+      // {
+        platforms = with lib.platforms; linux;
+      };
     buildInputs = rapidsnark.buildInputs ++ [pistache];
 
     buildPhase = ''

diff --git a/packages/solana-bpf-tools/default.nix b/packages/solana-bpf-tools/default.nix
@@ -10,7 +10,7 @@ with pkgs;
     };
 
     # TODO autoPatchElf is Linux-specific. We need a cross-platform solution.
-    nativeBuildInputs = [autoPatchelfHook];
+    nativeBuildInputs = lib.optionals stdenv.isLinux [autoPatchelfHook];
 
     buildInputs = with pkgs; [
       zlib

diff --git a/packages/wasmd/default.nix b/packages/wasmd/default.nix
@@ -35,7 +35,7 @@ in
 
     subPackages = ["cmd/wasmd"];
 
-    buildInputs = [autoPatchelfHook];
+    nativeBuildInputs = lib.optionals stdenv.isLinux [autoPatchelfHook];
 
     postBuild = ''
       mkdir -p "$out/lib"