Enable ovni for cross compilation

overlay.nix

@@ -94,8 +94,7 @@ let
     };
   };
 
-  # For now, only build toplevel packages in CI/Hydra
-  pkgsTopLevel = filterAttrs (_: isDerivation) bscPkgs;
+  pkgs = filterAttrs (_: isDerivation) bscPkgs;
 
   # Native build in that platform doesn't imply cross build works
   canCrossCompile = platform: pkg:
@@ -105,7 +104,7 @@ let
     (meta.availableOn platform pkg);
 
   # For now only RISC-V
-  crossSet = { riscv64 = final.pkgsCross.riscv64.bsc.pkgsTopLevel; };
+  crossSet = { riscv64 = final.pkgsCross.riscv64.bsc.pkgs; };
 
   buildList = name: paths:
     final.runCommandLocal name { } ''
@@ -119,7 +118,7 @@ let
       printf '%s\n' $deps >$out
     '';
 
-  pkgsList = buildList "ci-pkgs" (builtins.attrValues pkgsTopLevel);
+  pkgsList = buildList "ci-pkgs" (builtins.attrValues pkgs);
   testsList = buildList "ci-tests" (collect isDerivation tests);
   allList = buildList' "ci-all" [ pkgsList testsList ];
   # For now only RISC-V
@@ -140,10 +139,9 @@ in bscPkgs // {
     # Direct access to package sets
     tests = tests;
     pkgs = bscPkgs;
-    pkgsTopLevel = pkgsTopLevel;
     cross = crossSet;
 
     # Hydra uses attribute sets of pkgs
-    hydraJobs = { tests = tests; pkgs = pkgsTopLevel; cross = crossSet; };
+    hydraJobs = { tests = tests; pkgs = bscPkgs; cross = crossSet; };
   };
 }

pkgs/extrae/default.nix

@@ -20,7 +20,6 @@
 #, python3Packages
 , installShellFiles
 , symlinkJoin
-, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
 }:
 
 let
@@ -88,7 +87,7 @@ stdenv.mkDerivation rec {
       --enable-sampling
       --with-unwind=${libunwind.dev}
       --with-xml-prefix=${libxml2.dev}
-      ${lib.optionalString enablePapi "--with-papi=${papi}"}
+      --with-papi=${papi}
       ${if (mpi != null) then ''--with-mpi=${mpi}''
         else ''--without-mpi''}
       --without-dyninst)

pkgs/lmbench/default.nix

@@ -35,8 +35,6 @@ stdenv.mkDerivation rec {
       CFLAGS=-Wno-implicit-int
       CPPFLAGS=-I${libtirpc.dev}/include/tirpc
       LDFLAGS=-ltirpc
-      CC=$CC
-      AR=$AR
     )
   '';
 

pkgs/nanos6/default.nix

@@ -16,7 +16,6 @@
 , jemallocNanos6 ? null
 , cachelineBytes ? 64
 , enableGlibcxxDebug ? false
-, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
 , useGit ? false
 , gitUrl ? "ssh://git@bscpm04.bsc.es/nanos6/nanos6"
 , gitBranch ? "master"
@@ -48,8 +47,6 @@ let
   };
 
   source = if (useGit) then git else release;
-
-  isCross = stdenv.hostPlatform != stdenv.buildPlatform;
 in
   stdenv.mkDerivation (source // {
     pname = "nanos6";
@@ -74,13 +71,9 @@ in
       "--disable-all-instrumentations"
       "--enable-ovni-instrumentation"
       "--with-ovni=${ovni}"
-      "--with-boost=${boost.dev}"
     ] ++
       (optional enableJemalloc "--with-jemalloc=${jemallocNanos6}") ++
-      (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG") ++
-      # Most nanos6 api symbols are resolved at runtime, so prefer
-      # ifunc by default
-      (optional isCross "--with-symbol-resolution=ifunc");
+      (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG");
 
     postConfigure = lib.optionalString (!enableDebug) ''
       # Disable debug
@@ -104,14 +97,16 @@ in
       # TODO: papi_version is needed for configure:
       # ./configure: line 27378: papi_version: command not found
       # This probably breaks cross-compilation
-    ] ++ lib.optionals enablePapi [ papi ];
+      papi
+    ];
 
     buildInputs = [
       boost
       numactl
       hwloc
+      papi
       ovni
-    ] ++ lib.optionals enablePapi [ papi ];
+    ];
 
     # Create a script that sets NANOS6_HOME
     postInstall = ''

pkgs/nosv/default.nix

@@ -7,7 +7,7 @@
 , numactl
 , hwloc
 , papi
-, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
+, enablePapi ? true
 , cacheline ? 64 # bits
 , ovni ? null
 , useGit ? false