diff --git a/overlay.nix b/overlay.nix
index 3b02ae30..d7560856 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -107,7 +107,12 @@ let
     (meta.availableOn platform pkg);
 
   # For now only RISC-V
-  crossSet = { riscv64 = final.pkgsCross.riscv64.bsc.pkgsTopLevel; };
+  crossSet = genAttrs [ "riscv64" ] genCross;
+
+  genCross = platform:
+    # filter out packages by meta.platforms
+    filterAttrs (_: meta.availableOn final.pkgsCross.${platform}.stdenv.hostPlatform)
+    final.pkgsCross.${platform}.bsc.pkgsTopLevel;
 
   buildList = name: paths:
     final.runCommandLocal name { } ''
diff --git a/pkgs/amd-uprof/default.nix b/pkgs/amd-uprof/default.nix
index a7c58e5d..6f566c84 100644
--- a/pkgs/amd-uprof/default.nix
+++ b/pkgs/amd-uprof/default.nix
@@ -90,7 +90,7 @@ in
     meta = {
       description = "Performance analysis tool-suite for x86 based applications";
       homepage = "https://www.amd.com/es/developer/uprof.html";
-      platforms = lib.platforms.linux;
+      platforms = [ "x86_64-linux" ];
       license = lib.licenses.unfree;
       maintainers = with lib.maintainers.bsc; [ rarias varcila ];
     };
diff --git a/pkgs/cudainfo/default.nix b/pkgs/cudainfo/default.nix
index 871d6978..9dddf35c 100644
--- a/pkgs/cudainfo/default.nix
+++ b/pkgs/cudainfo/default.nix
@@ -1,5 +1,6 @@
 {
   stdenv
+, lib
 , cudatoolkit
 , cudaPackages
 , autoAddDriverRunpath
@@ -40,4 +41,9 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     installPhase = "touch $out";
   };
+
+  meta = {
+    platforms = [ "x86_64-linux" ];
+    maintainers = with lib.maintainers.bsc; [ rarias ];
+  };
 })