From 76ddd85afeac894937824fe44f47d35315ec9e45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Wed, 23 Jul 2025 11:26:25 +0200 Subject: [PATCH] Fix strictDeps paraver Reviewed-by: Rodrigo Arias Mallo --- pkgs/paraver/default.nix | 6 +++--- pkgs/paraver/kernel.nix | 11 +++++++---- pkgs/paraver/release.nix | 7 +++++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/paraver/default.nix b/pkgs/paraver/default.nix index ba8a0c9..32e9796 100644 --- a/pkgs/paraver/default.nix +++ b/pkgs/paraver/default.nix @@ -60,17 +60,17 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + autoconf + automake + autoreconfHook wrapGAppsHook ]; buildInputs = [ - autoreconfHook boost libxml2.dev xml2 wx - autoconf - automake paraverKernel openssl.dev ]; diff --git a/pkgs/paraver/kernel.nix b/pkgs/paraver/kernel.nix index 742610f..588aa3d 100644 --- a/pkgs/paraver/kernel.nix +++ b/pkgs/paraver/kernel.nix @@ -44,14 +44,17 @@ stdenv.mkDerivation rec { "--enable-openmp" ]; - buildInputs = [ + nativeBuildInputs = [ autoreconfHook - boost - libxml2.dev - xml2 autoconf automake pkg-config + ]; + + buildInputs = [ + boost + libxml2.dev + xml2 zlib ]; } diff --git a/pkgs/paraver/release.nix b/pkgs/paraver/release.nix index 7919842..9282ebb 100644 --- a/pkgs/paraver/release.nix +++ b/pkgs/paraver/release.nix @@ -61,13 +61,16 @@ stdenv.mkDerivation rec { "--with-wx-config=${wx}/bin/wx-config" ]; + nativeBuildInputs = [ + autoconf + automake + ]; + buildInputs = [ boost xml2 libxml2.dev wx - autoconf - automake openssl.dev ];