From 109ec07800602a800477e2a7ab9656c78722ebc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Tue, 2 Dec 2025 14:47:54 +0100 Subject: [PATCH] Enable papi when cross-compiling --- pkgs/extrae/default.nix | 2 +- pkgs/nanos6/default.nix | 2 +- pkgs/nosv/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/extrae/default.nix b/pkgs/extrae/default.nix index 18843dd..98c8fda 100644 --- a/pkgs/extrae/default.nix +++ b/pkgs/extrae/default.nix @@ -20,7 +20,7 @@ #, python3Packages , installShellFiles , symlinkJoin -, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling +, enablePapi ? true }: let diff --git a/pkgs/nanos6/default.nix b/pkgs/nanos6/default.nix index 8157fdf..08c7689 100644 --- a/pkgs/nanos6/default.nix +++ b/pkgs/nanos6/default.nix @@ -16,7 +16,7 @@ , jemallocNanos6 ? null , cachelineBytes ? 64 , enableGlibcxxDebug ? false -, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling +, enablePapi ? true , useGit ? false , gitUrl ? "ssh://git@bscpm04.bsc.es/nanos6/nanos6" , gitBranch ? "master" diff --git a/pkgs/nosv/default.nix b/pkgs/nosv/default.nix index cfb271c..04ff624 100644 --- a/pkgs/nosv/default.nix +++ b/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 @@ -40,7 +40,7 @@ let source = if (useGit) then git else release; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "nosv"; inherit (source) src version; hardeningDisable = [ "all" ];